diff --git a/base/BUILD.gn b/base/BUILD.gn
index 25fc7c0..eb59b7a 100644
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -380,33 +380,33 @@ component("base") {
     "message_loop/message_pump_mac.mm",
     "message_loop/message_pump_win.cc",
     "message_loop/message_pump_win.h",
-    "metrics/bucket_ranges.cc",
-    "metrics/bucket_ranges.h",
-    "metrics/field_trial.cc",
-    "metrics/field_trial.h",
-    "metrics/histogram.cc",
-    "metrics/histogram.h",
-    "metrics/histogram_base.cc",
-    "metrics/histogram_base.h",
-    "metrics/histogram_delta_serialization.",
-    "metrics/histogram_delta_serialization.cc",
-    "metrics/histogram_flattener.h",
-    "metrics/histogram_macros.h",
-    "metrics/histogram_samples.cc",
-    "metrics/histogram_samples.h",
-    "metrics/histogram_snapshot_manager.cc",
-    "metrics/histogram_snapshot_manager.h",
-    "metrics/sample_map.cc",
-    "metrics/sample_map.h",
-    "metrics/sample_vector.cc",
-    "metrics/sample_vector.h",
-    "metrics/sparse_histogram.cc",
-    "metrics/sparse_histogram.h",
-    "metrics/statistics_recorder.cc",
-    "metrics/statistics_recorder.h",
-    "metrics/user_metrics.cc",
-    "metrics/user_metrics.h",
-    "metrics/user_metrics_action.h",
+#    "metrics/bucket_ranges.cc",
+#    "metrics/bucket_ranges.h",
+#    "metrics/field_trial.cc",
+#    "metrics/field_trial.h",
+#    "metrics/histogram.cc",
+#    "metrics/histogram.h",
+#    "metrics/histogram_base.cc",
+#    "metrics/histogram_base.h",
+#    "metrics/histogram_delta_serialization.",
+#    "metrics/histogram_delta_serialization.cc",
+#    "metrics/histogram_flattener.h",
+#    "metrics/histogram_macros.h",
+#    "metrics/histogram_samples.cc",
+#    "metrics/histogram_samples.h",
+#    "metrics/histogram_snapshot_manager.cc",
+#    "metrics/histogram_snapshot_manager.h",
+#    "metrics/sample_map.cc",
+#    "metrics/sample_map.h",
+#    "metrics/sample_vector.cc",
+#    "metrics/sample_vector.h",
+#    "metrics/sparse_histogram.cc",
+#    "metrics/sparse_histogram.h",
+#    "metrics/statistics_recorder.cc",
+#    "metrics/statistics_recorder.h",
+#    "metrics/user_metrics.cc",
+#    "metrics/user_metrics.h",
+#    "metrics/user_metrics_action.h",
     "move.h",
     "native_library.h",
     "native_library_mac.mm",
diff --git a/base/base.gypi b/base/base.gypi
index 0f8fff2..fbf1042 100644
--- a/base/base.gypi
+++ b/base/base.gypi
@@ -371,31 +371,31 @@
           'message_loop/message_pump_win.cc',
           'message_loop/message_pump_win.h',
           'message_loop/timer_slack.h',
-          'metrics/bucket_ranges.cc',
-          'metrics/bucket_ranges.h',
-          'metrics/histogram.cc',
-          'metrics/histogram.h',
-          'metrics/histogram_base.cc',
-          'metrics/histogram_base.h',
-          'metrics/histogram_delta_serialization.cc',
-          'metrics/histogram_delta_serialization.h',
-          'metrics/histogram_flattener.h',
-          'metrics/histogram_macros.h',
-          'metrics/histogram_samples.cc',
-          'metrics/histogram_samples.h',
-          'metrics/histogram_snapshot_manager.cc',
-          'metrics/histogram_snapshot_manager.h',
-          'metrics/sample_map.cc',
-          'metrics/sample_map.h',
-          'metrics/sample_vector.cc',
-          'metrics/sample_vector.h',
-          'metrics/sparse_histogram.cc',
-          'metrics/sparse_histogram.h',
-          'metrics/statistics_recorder.cc',
-          'metrics/statistics_recorder.h',
-          'metrics/user_metrics.cc',
-          'metrics/user_metrics.h',
-          'metrics/user_metrics_action.h',
+#          'metrics/bucket_ranges.cc',
+#          'metrics/bucket_ranges.h',
+#          'metrics/histogram.cc',
+#          'metrics/histogram.h',
+#          'metrics/histogram_base.cc',
+#          'metrics/histogram_base.h',
+#          'metrics/histogram_delta_serialization.cc',
+#          'metrics/histogram_delta_serialization.h',
+#          'metrics/histogram_flattener.h',
+#          'metrics/histogram_macros.h',
+#          'metrics/histogram_samples.cc',
+#          'metrics/histogram_samples.h',
+#          'metrics/histogram_snapshot_manager.cc',
+#          'metrics/histogram_snapshot_manager.h',
+#          'metrics/sample_map.cc',
+#          'metrics/sample_map.h',
+#          'metrics/sample_vector.cc',
+#          'metrics/sample_vector.h',
+#          'metrics/sparse_histogram.cc',
+#          'metrics/sparse_histogram.h',
+#          'metrics/statistics_recorder.cc',
+#          'metrics/statistics_recorder.h',
+#          'metrics/user_metrics.cc',
+#          'metrics/user_metrics.h',
+#          'metrics/user_metrics_action.h',
           'move.h',
           'native_library.h',
           'native_library_mac.mm',
diff --git a/base/message_loop/message_loop.h b/base/message_loop/message_loop.h
index 7c76616..5274fac 100644
--- a/base/message_loop/message_loop.h
+++ b/base/message_loop/message_loop.h
@@ -38,7 +38,7 @@
 
 namespace base {
 
-class HistogramBase;
+//class HistogramBase;
 class RunLoop;
 class ThreadTaskRunnerHandle;
 class WaitableEvent;
@@ -487,7 +487,7 @@ class BASE_EXPORT MessageLoop : public MessagePump::Delegate {
 
   std::string thread_name_;
   // A profiling histogram showing the counts of various messages and events.
-  HistogramBase* message_histogram_;
+//  HistogramBase* message_histogram_;
 
   RunLoop* run_loop_;
 
diff --git a/base/prefs/json_pref_store.cc b/base/prefs/json_pref_store.cc
index c52a95c..cceb12d 100644
--- a/base/prefs/json_pref_store.cc
+++ b/base/prefs/json_pref_store.cc
@@ -13,7 +13,7 @@
 #include "base/json/json_file_value_serializer.h"
 #include "base/json/json_string_value_serializer.h"
 #include "base/memory/ref_counted.h"
-#include "base/metrics/histogram.h"
+//#include "base/metrics/histogram.h"
 #include "base/prefs/pref_filter.h"
 #include "base/sequenced_task_runner.h"
 #include "base/strings/string_util.h"
@@ -90,7 +90,7 @@ PersistentPrefStore::PrefReadError HandleReadErrors(
   }
   return PersistentPrefStore::PREF_READ_ERROR_NONE;
 }
-
+/*
 // Records a sample for |size| in the Settings.JsonDataReadSizeKilobytes
 // histogram suffixed with the base name of the JSON file under |path|.
 void RecordJsonDataSizeHistogram(const base::FilePath& path, size_t size) {
@@ -105,7 +105,7 @@ void RecordJsonDataSizeHistogram(const base::FilePath& path, size_t size) {
       "Settings.JsonDataReadSizeKilobytes." + spaceless_basename, 1, 10000, 50,
       base::HistogramBase::kUmaTargetedHistogramFlag);
   histogram->Add(static_cast<int>(size) / 1024);
-}
+}*/
 
 scoped_ptr<JsonPrefStore::ReadResult> ReadPrefsFromDisk(
     const base::FilePath& path,
@@ -125,8 +125,8 @@ scoped_ptr<JsonPrefStore::ReadResult> ReadPrefsFromDisk(
       HandleReadErrors(read_result->value.get(), path, error_code, error_msg);
   read_result->no_dir = !base::PathExists(path.DirName());
 
-  if (read_result->error == PersistentPrefStore::PREF_READ_ERROR_NONE)
-    RecordJsonDataSizeHistogram(path, serializer.get_last_read_size());
+/*  if (read_result->error == PersistentPrefStore::PREF_READ_ERROR_NONE)
+    RecordJsonDataSizeHistogram(path, serializer.get_last_read_size());FIXME: don't know if the call needs to be made this one: serializer.get_last_read_size() for the below return*/
 
   return read_result.Pass();
 }
diff --git a/base/prefs/pref_service.cc b/base/prefs/pref_service.cc
index 5afb5ea..df355d7 100644
--- a/base/prefs/pref_service.cc
+++ b/base/prefs/pref_service.cc
@@ -10,7 +10,7 @@
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
-#include "base/metrics/histogram.h"
+//#include "base/metrics/histogram.h"
 #include "base/prefs/default_pref_store.h"
 #include "base/prefs/pref_notifier_impl.h"
 #include "base/prefs/pref_registry.h"
diff --git a/build/config/features.gni b/build/config/features.gni
index 4d01a87..274d195 100644
--- a/build/config/features.gni
+++ b/build/config/features.gni
@@ -72,7 +72,7 @@ declare_args() {
   enable_google_now = !is_ios && !is_android
 
   enable_one_click_signin = is_win || is_mac || (is_linux && !is_chromeos)
-}
+#}
 
 # Additional dependent variables -----------------------------------------------
 
@@ -178,3 +178,4 @@ use_gconf = is_linux && !is_chromeos
 # For official GYP builds, this flag is set, it will likely need to be
 # parameterized in the future for a similar use.
 enable_hangout_services_extension = false
+}
diff --git a/build/json_schema_api.gni b/build/json_schema_api.gni
index 68a9fdd..a0a2d4b 100644
--- a/build/json_schema_api.gni
+++ b/build/json_schema_api.gni
@@ -75,7 +75,9 @@ template("json_schema_api") {
     visibility = target_visibility
   }
 
-  sources = invoker.sources
+#  if (bundle_registration) {
+    sources = invoker.sources
+#  }
   root_namespace = invoker.root_namespace
 
   compiler_root = "//tools/json_schema_compiler"
diff --git a/chrome/app/BUILD.gn b/chrome/app/BUILD.gn
index b7dfb20..e427cdc 100644
--- a/chrome/app/BUILD.gn
+++ b/chrome/app/BUILD.gn
@@ -132,33 +132,33 @@ if (is_android) {
 }
 
 # GYP version: chrome/chrome_resources.gyp:chrome_strings_map
-action("make_generated_resources_map") {
-  # Targets should depend on generated_resources_map instead.
-  visibility = [ ":generated_resources_map" ]
-
-  script = "//chrome/browser/metrics/variations/generate_resources_map.py"
-
-  inputs = [
-    "$root_gen_dir/chrome/grit/generated_resources.h",
-  ]
-  outputs = [
-    "$root_gen_dir/chrome/generated_resources_map.cc",
-  ]
-
-  args =
-      rebase_path(inputs, root_build_dir) + rebase_path(outputs, root_build_dir)
-
-  deps = [
-    ":generated_resources",
-  ]
-}
+#action("make_generated_resources_map") {
+#  # Targets should depend on generated_resources_map instead.
+#  visibility = [ ":generated_resources_map" ]
+#
+#  script = "//chrome/browser/metrics/variations/generate_resources_map.py"
+#
+#  inputs = [
+#    "$root_gen_dir/chrome/grit/generated_resources.h",
+#  ]
+#  outputs = [
+#    "$root_gen_dir/chrome/generated_resources_map.cc",
+#  ]
+#
+#  args =
+#      rebase_path(inputs, root_build_dir) + rebase_path(outputs, root_build_dir)
+#
+#  deps = [
+#    ":generated_resources",
+#  ]
+#}
 
 # Collect the generated .cc file from make_generated_resources_map and put it
 # in a source set so targets that depend on it will link the source rather than
 # specifying it manually. This doesn't happen in the GYP build.
-source_set("generated_resources_map") {
-  sources = get_target_outputs(":make_generated_resources_map")
-}
+#source_set("generated_resources_map") {
+#  sources = get_target_outputs(":make_generated_resources_map")
+#}
 
 # GYP version: chrome/chrome_resources.gyp:chrome_strings
 #              (generate_google_chrome_strings action)
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 1a8b1de..b3cc275 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -5580,7 +5580,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
       </message>
 
       <!-- Plugins -->
-      <if expr="enable_plugins">
+      <if expr="enable_plugins or not enable_plugins">
         <message name="IDS_PLUGINS_TITLE" desc="Title for the chrome://plugins page.">
           Plug-ins
         </message>
@@ -15179,7 +15179,7 @@ Do you accept?
       <message name="IDS_PUSH_MESSAGES_BUBBLE_FRAGMENT" desc="Question asked on the info bar whenever a domain wants to send push messages">
           Push notifications
       </message>
-      <if expr="enable_notifications">
+      <if expr="enable_notifications or not enable_notifications">
         <message name="IDS_PUSH_MESSAGING_GENERIC_NOTIFICATION_BODY" desc="Body text of an auto-generated notification informing the user that the site may have received an update in the background, in case the site did not satisfy the visible notification requirement itself.">
           This site has been updated in the background.
         </message>
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index a49fd73..420eb84 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -61,17 +61,17 @@ static_library("browser") {
   # iOS/non-iOS shared deps. New dependencies should generally be added in the
   # non-iOS deps below.
   public_deps = [
-    "//components/autofill/core/browser",
+#    "//components/autofill/core/browser",
     "//content/public/browser",
     "//sql",
-    "//sync",
+#    "//sync",
   ]
   deps = [
     "//base/allocator",
     "//chrome:extra_resources",
     "//chrome:resources",
     "//chrome:strings",
-    "//chrome/app:generated_resources_map",
+#    "//chrome/app:generated_resources_map",
     "//chrome/app/resources:platform_locale_settings",
     "//chrome/app/theme:theme_resources",
     "//chrome/browser/net:cert_logger_proto",
@@ -79,10 +79,10 @@ static_library("browser") {
     "//chrome/browser/ui",
     "//chrome/common",
     "//chrome/common/net",
-    "//components/autofill/core/browser",
+#    "//components/autofill/core/browser",
     "//components/bookmarks/browser",
-    "//components/captive_portal",
-    "//components/cloud_devices/common",
+#    "//components/captive_portal",
+#    "//components/cloud_devices/common",
     "//components/component_updater",
     "//components/content_settings/core/browser",
     "//components/content_settings/core/common",
@@ -93,39 +93,39 @@ static_library("browser") {
     "//components/enhanced_bookmarks",
     "//components/favicon_base",
     "//components/favicon/core",
-    "//components/feedback",
+#    "//components/feedback",
     "//components/gcm_driver",
-    "//components/google/core/browser",
-    "//components/handoff",
+#    "//components/google/core/browser",
+#    "//components/handoff",
     "//components/history/core/browser",
     "//components/history/core/browser:proto",
     "//components/history/core/common",
     "//components/infobars/core",
     "//components/invalidation",
-    "//components/metrics:gpu",
-    "//components/metrics:net",
-    "//components/metrics:profiler",
-    "//components/metrics/proto:proto",
-    "//components/navigation_metrics",
+#    "//components/metrics:gpu",
+#    "//components/metrics:net",
+#    "//components/metrics:profiler",
+#    "//components/metrics/proto:proto",
+#    "//components/navigation_metrics",
     "//components/network_time",
     "//components/omnibox",
     "//components/os_crypt",
     "//components/packed_ct_ev_whitelist",
-    "//components/password_manager/core/browser",
-    "//components/password_manager/core/common",
+#    "//components/password_manager/core/browser",
+#    "//components/password_manager/core/common",
     "//components/policy:policy_component",
     "//components/precache/core",
     "//components/query_parser",
-    "//components/rappor",
+#    "//components/rappor",
     "//components/renderer_context_menu",
     "//components/search",
     "//components/search_engines",
     "//components/search_provider_logos",
-    "//components/signin/core/browser",
-    "//components/startup_metric_utils",
+#    "//components/signin/core/browser",
+#    "//components/startup_metric_utils",
     "//components/strings",
     "//components/suggestions",
-    "//components/sync_driver",
+#    "//components/sync_driver",
     "//components/translate/core/browser",
     "//components/translate/core/common",
     "//components/ui/zoom:ui_zoom",
@@ -143,14 +143,14 @@ static_library("browser") {
     "//crypto",
     "//google_apis",
     "//gpu/config",
-    "//jingle:notifier",
+#    "//jingle:notifier",
     "//skia",
     "//sql",
-    "//sync",
+#    "//sync",
     "//third_party/cacheinvalidation",
     "//third_party/icu",
     "//third_party/libxml",
-    "//third_party/libjingle",
+#    "//third_party/libjingle",
     "//third_party/widevine/cdm:version_h",
     "//third_party/zlib",
     "//third_party/zlib:minizip",
@@ -159,7 +159,7 @@ static_library("browser") {
     "//ui/events:events_base",
     "//ui/gfx",
     "//ui/gfx/geometry",
-    "//ui/message_center",
+#    "//ui/message_center",
     "//ui/shell_dialogs",
     "//ui/strings",
     "//ui/resources",
@@ -185,17 +185,17 @@ static_library("browser") {
                            "//chrome")
     sources +=
         rebase_path(gypi_values.chrome_browser_favicon_sources, ".", "//chrome")
-    sources +=
-        rebase_path(gypi_values.chrome_browser_google_sources, ".", "//chrome")
+#    sources +=
+#        rebase_path(gypi_values.chrome_browser_google_sources, ".", "//chrome")
     sources +=
         rebase_path(gypi_values.chrome_browser_history_sources, ".", "//chrome")
-    sources +=
-        rebase_path(gypi_values.chrome_browser_metrics_sources, ".", "//chrome")
+#    sources +=
+#        rebase_path(gypi_values.chrome_browser_metrics_sources, ".", "//chrome")
     sources +=
         rebase_path(gypi_values.chrome_browser_net_sources, ".", "//chrome")
-    sources += rebase_path(gypi_values.chrome_browser_password_manager_sources,
-                           ".",
-                           "//chrome")
+#    sources += rebase_path(gypi_values.chrome_browser_password_manager_sources,
+#                           ".",
+#                           "//chrome")
     sources += rebase_path(gypi_values.chrome_browser_predictor_sources,
                            ".",
                            "//chrome")
@@ -212,12 +212,12 @@ static_library("browser") {
                            "//chrome")
     sources +=
         rebase_path(gypi_values.chrome_browser_session_sources, ".", "//chrome")
-    sources +=
-        rebase_path(gypi_values.chrome_browser_signin_sources, ".", "//chrome")
+#    sources +=
+#        rebase_path(gypi_values.chrome_browser_signin_sources, ".", "//chrome")
     sources +=
         rebase_path(gypi_values.chrome_browser_ssl_sources, ".", "//chrome")
-    sources +=
-        rebase_path(gypi_values.chrome_browser_sync_sources, ".", "//chrome")
+#    sources +=
+#        rebase_path(gypi_values.chrome_browser_sync_sources, ".", "//chrome")
     sources += rebase_path(gypi_values.chrome_browser_web_resource_sources,
                            ".",
                            "//chrome")
@@ -225,22 +225,22 @@ static_library("browser") {
     deps += [
       "//apps",
       "//cc",
-      "//chrome/app:generated_resources_map",
+#      "//chrome/app:generated_resources_map",
       "//chrome/app/theme:theme_resources",
       "//chrome/browser/devtools",
       "//chrome/browser/resources:component_extension_resources",
       "//chrome/installer/util",
       "//components/app_modal",
-      "//components/autofill/content/browser",
+#      "//components/autofill/content/browser",
       "//components/data_reduction_proxy/content/browser",
       "//components/dom_distiller/content",
       "//components/history/content/browser",
       "//components/keyed_service/content",
       "//components/navigation_interception",
-      "//components/password_manager/content/browser",
+#      "//components/password_manager/content/browser",
       "//components/precache/content",
       "//components/sessions:sessions_content",
-      "//components/storage_monitor",
+#      "//components/storage_monitor",
       "//components/translate/content/browser",
       "//components/url_matcher",
       "//components/visitedlink/browser",
@@ -266,7 +266,7 @@ static_library("browser") {
       "//third_party/npapi",
       "//third_party/re2",
       "//third_party/smhasher:cityhash",
-      "//third_party/webrtc/modules/desktop_capture",
+#      "//third_party/webrtc/modules/desktop_capture",
       "//ui/base/ime",
       "//ui/gl",
       "//ui/resources",
@@ -319,10 +319,10 @@ static_library("browser") {
   if (enable_extensions) {
     public_deps += [ "//chrome/browser/extensions" ]
     deps += [
-      "//chrome/browser/sync_file_system/drive_backend:sync_file_system_drive_proto",
+#      "//chrome/browser/sync_file_system/drive_backend:sync_file_system_drive_proto",
       "//chrome/common/extensions/api",
       "//chrome/common/extensions/api:api_registration",
-      "//components/proximity_auth/cryptauth",
+#      "//components/proximity_auth/cryptauth",
       "//extensions/components/javascript_dialog_extensions_client",
       "//media/cast:net",
     ]
@@ -404,36 +404,36 @@ static_library("browser") {
       "//third_party/adobe/flash:flapper_version_h",
     ]
   }
-  if (safe_browsing_mode != 0) {
-    sources +=
-        rebase_path(gypi_values.chrome_browser_safe_browsing_basic_sources,
-                    ".",
-                    "//chrome")
-    deps += [
-      "//chrome/browser/safe_browsing:chunk_proto",
-      "//chrome/browser/safe_browsing:metadata_proto",
-      "//chrome/browser/safe_browsing:report_proto",
-    ]
-    if (safe_browsing_mode == 1) {
-      sources +=
-          rebase_path(gypi_values.chrome_browser_safe_browsing_full_sources,
-                      ".",
-                      "//chrome")
-      defines += [ "FULL_SAFE_BROWSING" ]
-      deps += [ "//chrome/common/safe_browsing:proto" ]
-    } else if (safe_browsing_mode == 2) {
-      defines += [ "MOBILE_SAFE_BROWSING" ]
-    }
-  }
+#  if (safe_browsing_mode != 0) {
+#    sources +=
+#        rebase_path(gypi_values.chrome_browser_safe_browsing_basic_sources,
+#                    ".",
+#                    "//chrome")
+#    deps += [
+#      "//chrome/browser/safe_browsing:chunk_proto",
+#      "//chrome/browser/safe_browsing:metadata_proto",
+#      "//chrome/browser/safe_browsing:report_proto",
+#    ]
+#    if (safe_browsing_mode == 1) {
+#      sources +=
+#          rebase_path(gypi_values.chrome_browser_safe_browsing_full_sources,
+#                      ".",
+#                      "//chrome")
+#      defines += [ "FULL_SAFE_BROWSING" ]
+#      deps += [ "//chrome/common/safe_browsing:proto" ]
+#    } else if (safe_browsing_mode == 2) {
+#      defines += [ "MOBILE_SAFE_BROWSING" ]
+#    }
+#  }
 
   if (is_linux) {
     deps += [
-      "//device/media_transfer_protocol",
-      "//device/udev_linux",
+#      "//device/media_transfer_protocol",
+#      "//device/udev_linux",
     ]
   }
   if (is_linux && !is_chromeos) {
-    deps += [ "//third_party/speech-dispatcher" ]
+#    deps += [ "//third_party/speech-dispatcher" ]
   }
 
   if (is_chromeos) {
@@ -584,8 +584,8 @@ static_library("browser") {
                            ".",
                            "//chrome")
     deps += [
-      "//device/core",
-      "//device/usb",
+#      "//device/core",
+#      "//device/usb",
     ]
   }
 
@@ -739,8 +739,8 @@ static_library("browser") {
   }
   if (!enable_autofill_dialog || is_android || is_ios) {
     sources -= [
-      "autofill/validation_rules_storage_factory.cc",
-      "autofill/validation_rules_storage_factory.h",
+#      "autofill/validation_rules_storage_factory.cc",
+#      "autofill/validation_rules_storage_factory.h",
     ]
   }
   if (enable_wifi_bootstrapping) {
@@ -931,10 +931,10 @@ source_set("test_support") {
     "signin/fake_signin_manager.h",
     "ssl/ssl_client_auth_requestor_mock.cc",
     "ssl/ssl_client_auth_requestor_mock.h",
-    "sync/profile_sync_components_factory_mock.cc",
-    "sync/profile_sync_components_factory_mock.h",
-    "sync/profile_sync_service_mock.cc",
-    "sync/profile_sync_service_mock.h",
+#    "sync/profile_sync_components_factory_mock.cc",
+#    "sync/profile_sync_components_factory_mock.h",
+#    "sync/profile_sync_service_mock.cc",
+#    "sync/profile_sync_service_mock.h",
     "ui/webui/signin/login_ui_test_utils.cc",
     "ui/webui/signin/login_ui_test_utils.h",
   ]
@@ -947,10 +947,10 @@ source_set("test_support") {
     "//base:prefs_test_support",
     "//chrome/browser",
     "//chrome/common",
-    "//chrome/common/safe_browsing:proto",
+#    "//chrome/common/safe_browsing:proto",
     "//components/invalidation",
     "//components/invalidation:test_support",
-    "//components/password_manager/core/browser:test_support",
+#    "//components/password_manager/core/browser:test_support",
     "//components/search_engines:test_support",
     "//content/test:test_support",
     "//chrome/app/theme:theme_resources",
@@ -1042,12 +1042,12 @@ source_set("test_support") {
     ]
   }
 
-  if (safe_browsing_mode == 1) {
-    sources += [
-      "extensions/fake_safe_browsing_database_manager.cc",
-      "extensions/fake_safe_browsing_database_manager.h",
-    ]
-  }
+#  if (safe_browsing_mode == 1) {
+#    sources += [
+#      "extensions/fake_safe_browsing_database_manager.cc",
+#      "extensions/fake_safe_browsing_database_manager.h",
+#    ]
+#  }
 
   if (enable_extensions) {
     sources += [
@@ -1080,7 +1080,7 @@ source_set("test_support") {
       "media_galleries/media_galleries_test_util.cc",
       "media_galleries/media_galleries_test_util.h",
     ]
-    deps += [ "//components/storage_monitor:test_support" ]
+#    deps += [ "//components/storage_monitor:test_support" ]
   }
 
   if (enable_mdns) {
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 7f41b7f..c47d97c 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -1956,6 +1956,7 @@ const Experiment kExperiments[] = {
     MULTI_VALUE_TYPE(kAutofillSyncCredentialChoices)
   },
 #if !defined(OS_ANDROID)
+#if !defined(OS_LINUX)
   {
     "enable-message-center-always-scroll-up-upon-notification-removal",
     IDS_FLAGS_ENABLE_MESSAGE_CENTER_ALWAYS_SCROLL_UP_UPON_REMOVAL_NAME,
@@ -1964,6 +1965,7 @@ const Experiment kExperiments[] = {
     SINGLE_VALUE_TYPE(
         switches::kEnableMessageCenterAlwaysScrollUpUponNotificationRemoval)
   },
+#endif
   {
     "enable-md-settings",
     IDS_FLAGS_ENABLE_MATERIAL_DESIGN_SETTINGS_NAME,
diff --git a/chrome/browser/apps/ephemeral_app_launcher.cc b/chrome/browser/apps/ephemeral_app_launcher.cc
index 469602c..9fdf963 100644
--- a/chrome/browser/apps/ephemeral_app_launcher.cc
+++ b/chrome/browser/apps/ephemeral_app_launcher.cc
@@ -339,10 +339,10 @@ void EphemeralAppLauncher::OnInstallChecked(int check_failures) {
     return;
   }
 
-  if (install_checker_->blacklist_state() == extensions::BLACKLISTED_MALWARE) {
+/*  if (install_checker_->blacklist_state() == extensions::BLACKLISTED_MALWARE) {
     AbortLaunch(webstore_install::BLACKLISTED, kBlacklistedError);
     return;
-  }
+  }*/
 
   if (!install_checker_->requirement_errors().empty()) {
     AbortLaunch(webstore_install::REQUIREMENT_VIOLATIONS,
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
index 2f86717..d560e0a 100644
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -106,7 +106,8 @@
 #endif
 
 #if !defined(OS_ANDROID)
-#include "chrome/browser/chrome_device_client.h"
+//#include "chrome/browser/chrome_device_client.h"
+//TODO: what is this gcm? wasn't it some kind of cypher?
 #include "chrome/browser/services/gcm/gcm_desktop_utils.h"
 #include "components/gcm_driver/gcm_client_factory.h"
 #endif
@@ -202,7 +203,7 @@ BrowserProcessImpl::BrowserProcessImpl(
 #endif
 
 #if !defined(OS_ANDROID)
-  device_client_.reset(new ChromeDeviceClient);
+//  device_client_.reset(new ChromeDeviceClient);
 #endif
 
 #if defined(ENABLE_EXTENSIONS)
diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_process_impl.h
index 9122d8f..961c55a 100644
--- a/chrome/browser/browser_process_impl.h
+++ b/chrome/browser/browser_process_impl.h
@@ -21,7 +21,7 @@
 #include "base/timer/timer.h"
 #include "chrome/browser/browser_process.h"
 
-class ChromeDeviceClient;
+//class ChromeDeviceClient;
 class ChromeNetLog;
 class ChromeResourceDispatcherHostDelegate;
 class RemoteDebuggingServer;
@@ -306,7 +306,7 @@ class BrowserProcessImpl : public BrowserProcess,
   scoped_ptr<gcm::GCMDriver> gcm_driver_;
 
 #if !defined(OS_ANDROID)
-  scoped_ptr<ChromeDeviceClient> device_client_;
+//  scoped_ptr<ChromeDeviceClient> device_client_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(BrowserProcessImpl);
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
index d0e9284..d5cbe3e 100644
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -46,7 +46,7 @@
 #include "chrome/browser/chrome_browser_main_extra_parts.h"
 #include "chrome/browser/component_updater/cld_component_installer.h"
 #include "chrome/browser/component_updater/ev_whitelist_component_installer.h"
-#include "chrome/browser/component_updater/flash_component_installer.h"
+//#include "chrome/browser/component_updater/flash_component_installer.h"
 #include "chrome/browser/component_updater/recovery_component_installer.h"
 #include "chrome/browser/component_updater/supervised_user_whitelist_installer.h"
 #include "chrome/browser/component_updater/swiftshader_component_installer.h"
@@ -65,8 +65,8 @@
 #include "chrome/browser/nacl_host/nacl_browser_delegate_impl.h"
 #include "chrome/browser/net/chrome_net_log.h"
 #include "chrome/browser/net/crl_set_fetcher.h"
-#include "chrome/browser/notifications/desktop_notification_service.h"
-#include "chrome/browser/notifications/desktop_notification_service_factory.h"
+//#include "chrome/browser/notifications/desktop_notification_service.h"
+//#include "chrome/browser/notifications/desktop_notification_service_factory.h"
 #include "chrome/browser/performance_monitor/performance_monitor.h"
 #include "chrome/browser/plugins/plugin_prefs.h"
 #include "chrome/browser/power/process_power_collector.h"
@@ -74,8 +74,8 @@
 #include "chrome/browser/prefs/chrome_pref_service_factory.h"
 #include "chrome/browser/prefs/command_line_pref_store.h"
 #include "chrome/browser/prefs/pref_metrics_service.h"
-#include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h"
-#include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory.h"
+//#include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h"
+//#include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory.h"
 #include "chrome/browser/process_singleton.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
@@ -108,6 +108,7 @@
 #include "components/device_event_log/device_event_log.h"
 #include "components/google/core/browser/google_util.h"
 #include "components/language_usage_metrics/language_usage_metrics.h"
+//TODO: remove metrics:
 #include "components/metrics/metrics_service.h"
 #include "components/metrics/profiler/tracking_synchronizer.h"
 #include "components/nacl/browser/nacl_browser.h"
@@ -143,7 +144,7 @@
 #if defined(OS_ANDROID)
 #include "chrome/browser/metrics/thread_watcher_android.h"
 #else
-#include "chrome/browser/feedback/feedback_profile_observer.h"
+//#include "chrome/browser/feedback/feedback_profile_observer.h"
 #endif  // defined(OS_ANDROID)
 
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
@@ -412,7 +413,7 @@ void RegisterComponentsForUpdate() {
   // file IO to know you existing component version.
 #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
   RegisterRecoveryComponent(cus, g_browser_process->local_state());
-  RegisterPepperFlashComponent(cus);
+//  RegisterPepperFlashComponent(cus);
   RegisterSwiftShaderComponent(cus);
   RegisterWidevineCdmComponent(cus);
 #endif  // !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
@@ -1048,7 +1049,7 @@ void ChromeBrowserMainParts::PreProfileInit() {
 #if !defined(OS_ANDROID)
   // Initialize the feedback uploader so it can setup notifications for profile
   // creation.
-  feedback::FeedbackProfileObserver::Initialize();
+//  feedback::FeedbackProfileObserver::Initialize();
 
   ProfileManager* profile_manager = g_browser_process->profile_manager();
 
diff --git a/chrome/browser/component_updater/widevine_cdm_component_installer.cc b/chrome/browser/component_updater/widevine_cdm_component_installer.cc
index 73bcb32..61ac361 100644
--- a/chrome/browser/component_updater/widevine_cdm_component_installer.cc
+++ b/chrome/browser/component_updater/widevine_cdm_component_installer.cc
@@ -30,7 +30,9 @@
 #include "components/component_updater/default_component_installer.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/plugin_service.h"
-#include "content/public/common/pepper_plugin_info.h"
+#if defined(ENABLE_PLUGINS)
+  #include "content/public/common/pepper_plugin_info.h"
+#endif
 #include "media/cdm/ppapi/supported_cdm_versions.h"
 #include "third_party/widevine/cdm/widevine_cdm_common.h"
 
diff --git a/chrome/browser/devtools/BUILD.gn b/chrome/browser/devtools/BUILD.gn
index a7580cb..a469ac5 100644
--- a/chrome/browser/devtools/BUILD.gn
+++ b/chrome/browser/devtools/BUILD.gn
@@ -72,8 +72,8 @@ static_library("devtools") {
       "//skia",
       "//third_party/icu",
       "//third_party/leveldatabase",
-      "//third_party/libusb",
-      ":webrtc_device_provider_resources",
+#      "//third_party/libusb",
+#      ":webrtc_device_provider_resources",
     ]
     sources += [
       "browser_list_tabcontents_provider.cc",
@@ -94,22 +94,22 @@ static_library("devtools") {
       "device/port_forwarding_controller.h",
       "device/self_device_provider.cc",
       "device/self_device_provider.h",
-      "device/usb/android_rsa.cc",
-      "device/usb/android_rsa.h",
-      "device/usb/android_usb_device.cc",
-      "device/usb/android_usb_device.h",
-      "device/usb/android_usb_socket.cc",
-      "device/usb/android_usb_socket.h",
-      "device/usb/usb_device_provider.cc",
-      "device/usb/usb_device_provider.h",
-      "device/webrtc/devtools_bridge_client.cc",
-      "device/webrtc/devtools_bridge_client.h",
-      "device/webrtc/devtools_bridge_instances_request.cc",
-      "device/webrtc/devtools_bridge_instances_request.h",
-      "device/webrtc/send_command_request.cc",
-      "device/webrtc/send_command_request.h",
-      "device/webrtc/webrtc_device_provider.cc",
-      "device/webrtc/webrtc_device_provider.h",
+#      "device/usb/android_rsa.cc",
+#      "device/usb/android_rsa.h",
+#      "device/usb/android_usb_device.cc",
+#      "device/usb/android_usb_device.h",
+#      "device/usb/android_usb_socket.cc",
+#      "device/usb/android_usb_socket.h",
+#      "device/usb/usb_device_provider.cc",
+#      "device/usb/usb_device_provider.h",
+#      "device/webrtc/devtools_bridge_client.cc",
+#      "device/webrtc/devtools_bridge_client.h",
+#      "device/webrtc/devtools_bridge_instances_request.cc",
+#      "device/webrtc/devtools_bridge_instances_request.h",
+#      "device/webrtc/send_command_request.cc",
+#      "device/webrtc/send_command_request.h",
+#      "device/webrtc/webrtc_device_provider.cc",
+#      "device/webrtc/webrtc_device_provider.h",
       "devtools_contents_resizing_strategy.cc",
       "devtools_contents_resizing_strategy.h",
       "devtools_embedder_message_dispatcher.cc",
@@ -128,8 +128,8 @@ static_library("devtools") {
       "devtools_ui_bindings.h",
       "devtools_window.cc",
       "devtools_window.h",
-      "remote_debugging_server.cc",
-      "remote_debugging_server.h",
+#      "remote_debugging_server.cc",
+#      "remote_debugging_server.h",
     ]
   }
 }
diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUILD.gn
index 061b8c1..462fc4b 100644
--- a/chrome/browser/extensions/BUILD.gn
+++ b/chrome/browser/extensions/BUILD.gn
@@ -42,23 +42,24 @@ static_library("extensions") {
     "//chrome/common",
     "//chrome/common/extensions/api:api_registration",
     "//chrome/common/net",
-    "//chrome/common/safe_browsing:proto",
+#    "//chrome/common/safe_browsing:proto",
     "//chrome/installer/util",
-    "//components/copresence",
+#    "//components/copresence",
     "//components/history/core/browser:proto",
     "//components/onc",
-    "//components/proximity_auth",
+#    "//components/proximity_auth",
     "//components/strings",
+    #TODO; this:
     "//components/update_client",
     "//components/url_matcher",
     "//content/app/resources",
     "//content/public/common",
     "//crypto",
-    "//device/bluetooth",
-    "//device/hid",
+#    "//device/bluetooth",
+#    "//device/hid",
     "//extensions/browser",
     "//extensions/common/api",
-    "//extensions/common/api:api_registration",
+#    "//extensions/common/api:api_registration",
     "//extensions/strings",
     "//net",
     "//skia",
@@ -69,7 +70,7 @@ static_library("extensions") {
     "//third_party/icu",
     "//third_party/leveldatabase",
     "//third_party/re2",
-    "//third_party/webrtc/modules/desktop_capture",
+#    "//third_party/webrtc/modules/desktop_capture",
     "//ui/accessibility:ax_gen",
     "//ui/base",
     "//ui/base/ime",
@@ -138,9 +139,13 @@ static_library("extensions") {
 
   if (enable_webrtc) {
     sources += [ "api/webrtc_logging_private/webrtc_logging_private_api.cc" ]
-  } else {
-    sources +=
-        [ "api/webrtc_logging_private/webrtc_logging_private_api_stub.cc" ]
+#  } else {
+#    sources +=
+#        [ 
+#        #this path doesnt work, so foop all
+#        "../../common/extensions/api/webrtc_logging_private.h",
+#        "api/webrtc_logging_private/webrtc_logging_private_api.h",
+#        "api/webrtc_logging_private/webrtc_logging_private_api_stub.cc" ]
   }
 
   if (use_brlapi) {
@@ -149,7 +154,7 @@ static_library("extensions") {
                            ".",
                            "//chrome")
   } else {
-    sources += [ "api/braille_display_private/braille_controller_stub.cc" ]
+#    sources += [ "api/braille_display_private/braille_controller_stub.cc" ]
   }
 
   if (use_aura) {
@@ -167,12 +172,12 @@ static_library("extensions") {
     ]
   }
 
-  if (safe_browsing_mode == 1) {
-    defines += [ "FULL_SAFE_BROWSING" ]
-  }
-  if (safe_browsing_mode == 2) {
-    defines += [ "MOBILE_SAFE_BROWSING" ]
-  }
+#  if (safe_browsing_mode == 1) {
+#    defines += [ "FULL_SAFE_BROWSING" ]
+#  }
+#  if (safe_browsing_mode == 2) {
+#    defines += [ "MOBILE_SAFE_BROWSING" ]
+#  }
 
   if (is_win || is_mac) {
     deps += [ "//components/wifi" ]
diff --git a/chrome/browser/extensions/api/browsing_data/browsing_data_api.cc b/chrome/browser/extensions/api/browsing_data/browsing_data_api.cc
index 28c2679..f283d6e 100644
--- a/chrome/browser/extensions/api/browsing_data/browsing_data_api.cc
+++ b/chrome/browser/extensions/api/browsing_data/browsing_data_api.cc
@@ -266,6 +266,8 @@ bool BrowsingDataRemoverFunction::RunAsync() {
   }
 
   if (removal_mask_ & BrowsingDataRemover::REMOVE_PLUGIN_DATA) {
+    return false;
+  /*
     // If we're being asked to remove plugin data, check whether it's actually
     // supported.
     BrowserThread::PostTask(
@@ -275,6 +277,7 @@ bool BrowsingDataRemoverFunction::RunAsync() {
             &BrowsingDataRemoverFunction::CheckRemovingPluginDataSupported,
             this,
             PluginPrefs::GetForProfile(GetProfile())));
+            */
   } else {
     StartRemoving();
   }
diff --git a/chrome/browser/extensions/api/content_settings/content_settings_api.cc b/chrome/browser/extensions/api/content_settings/content_settings_api.cc
index d9d174c..6ff85c1 100644
--- a/chrome/browser/extensions/api/content_settings/content_settings_api.cc
+++ b/chrome/browser/extensions/api/content_settings/content_settings_api.cc
@@ -18,8 +18,8 @@
 #include "chrome/browser/extensions/api/content_settings/content_settings_store.h"
 #include "chrome/browser/extensions/api/preference/preference_api_constants.h"
 #include "chrome/browser/extensions/api/preference/preference_helpers.h"
-#include "chrome/browser/plugins/plugin_finder.h"
-#include "chrome/browser/plugins/plugin_installer.h"
+//#include "chrome/browser/plugins/plugin_finder.h"
+//#include "chrome/browser/plugins/plugin_installer.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/api/content_settings.h"
@@ -29,7 +29,7 @@
 #include "extensions/common/error_utils.h"
 
 using content::BrowserThread;
-using content::PluginService;
+//using content::PluginService;
 
 namespace Clear = extensions::api::content_settings::ContentSetting::Clear;
 namespace Get = extensions::api::content_settings::ContentSetting::Get;
@@ -250,10 +250,10 @@ bool ContentSettingsContentSettingGetResourceIdentifiersFunction::RunAsync() {
   ContentSettingsType content_type;
   EXTENSION_FUNCTION_VALIDATE(RemoveContentType(args_.get(), &content_type));
 
-  if (content_type != CONTENT_SETTINGS_TYPE_PLUGINS) {
+//  if (content_type != CONTENT_SETTINGS_TYPE_PLUGINS) {
     SendResponse(true);
     return true;
-  }
+/*  }
 
   PluginService::GetInstance()->GetPlugins(
       base::Bind(&ContentSettingsContentSettingGetResourceIdentifiersFunction::
@@ -287,6 +287,7 @@ void ContentSettingsContentSettingGetResourceIdentifiersFunction::OnGotPlugins(
           SendResponse,
           this,
           true));
+          */
 }
 
 }  // namespace extensions
diff --git a/chrome/browser/extensions/api/content_settings/content_settings_api.h b/chrome/browser/extensions/api/content_settings/content_settings_api.h
index 8c9d8e1..19e1d39 100644
--- a/chrome/browser/extensions/api/content_settings/content_settings_api.h
+++ b/chrome/browser/extensions/api/content_settings/content_settings_api.h
@@ -69,7 +69,7 @@ class ContentSettingsContentSettingGetResourceIdentifiersFunction
 
   // Callback method that gets executed when |plugins|
   // are asynchronously fetched.
-  void OnGotPlugins(const std::vector<content::WebPluginInfo>& plugins);
+//  void OnGotPlugins(const std::vector<content::WebPluginInfo>& plugins);
 };
 
 }  // namespace extensions
diff --git a/chrome/browser/extensions/api/permissions/permissions_api_helpers.cc b/chrome/browser/extensions/api/permissions/permissions_api_helpers.cc
index 19aa3e1..254c5d1 100644
--- a/chrome/browser/extensions/api/permissions/permissions_api_helpers.cc
+++ b/chrome/browser/extensions/api/permissions/permissions_api_helpers.cc
@@ -12,7 +12,7 @@
 #include "extensions/common/extension.h"
 #include "extensions/common/permissions/permission_set.h"
 #include "extensions/common/permissions/permissions_info.h"
-#include "extensions/common/permissions/usb_device_permission.h"
+//#include "extensions/common/permissions/usb_device_permission.h"
 #include "extensions/common/url_pattern_set.h"
 
 using extensions::APIPermission;
@@ -94,7 +94,7 @@ scoped_refptr<PermissionSet> UnpackPermissionSet(
           return NULL;
         }
 
-        APIPermission* permission = NULL;
+/*        APIPermission* permission = NULL;
 
         // Explicitly check the permissions that accept arguments until the bug
         // referenced above is fixed.
@@ -112,7 +112,7 @@ scoped_refptr<PermissionSet> UnpackPermissionSet(
           *error = ErrorUtils::FormatErrorMessage(kInvalidParameter, *it);
           return NULL;
         }
-        apis.insert(permission);
+        apis.insert(permission);*/
       } else {
         const APIPermissionInfo* permission_info = info->GetByName(*it);
         if (!permission_info) {
diff --git a/chrome/browser/extensions/api/screenlock_private/screenlock_private_api.cc b/chrome/browser/extensions/api/screenlock_private/screenlock_private_api.cc
index 78d1c49..4bc67bc 100644
--- a/chrome/browser/extensions/api/screenlock_private/screenlock_private_api.cc
+++ b/chrome/browser/extensions/api/screenlock_private/screenlock_private_api.cc
@@ -7,7 +7,7 @@
 #include "base/lazy_instance.h"
 #include "base/values.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/signin/easy_unlock_service.h"
+//#include "chrome/browser/signin/easy_unlock_service.h"
 #include "chrome/common/extensions/api/screenlock_private.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "extensions/browser/app_window/app_window_registry.h"
@@ -64,6 +64,7 @@ bool ScreenlockPrivateSetLockedFunction::RunAsync() {
       screenlock::SetLocked::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
   if (params->locked) {
+    /*
     if (extension()->id() == extension_misc::kEasyUnlockAppId &&
         AppWindowRegistry::Get(browser_context())
             ->GetAppWindowForAppAndKey(extension()->id(),
@@ -74,7 +75,7 @@ bool ScreenlockPrivateSetLockedFunction::RunAsync() {
       EasyUnlockService* service = EasyUnlockService::Get(GetProfile());
       if (service)
         service->SetTrialRun();
-    }
+    }*/
     ScreenlockBridge::Get()->Lock(GetProfile());
   } else {
     ScreenlockBridge::Get()->Unlock(GetProfile());
@@ -95,9 +96,9 @@ bool ScreenlockPrivateAcceptAuthAttemptFunction::RunSync() {
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
   Profile* profile = Profile::FromBrowserContext(browser_context());
-  EasyUnlockService* service = EasyUnlockService::Get(profile);
+/*  EasyUnlockService* service = EasyUnlockService::Get(profile);
   if (service)
-    service->FinalizeUnlock(params->accept);
+    service->FinalizeUnlock(params->accept);*/
   return true;
 }
 
diff --git a/chrome/browser/extensions/browser_context_keyed_service_factories.cc b/chrome/browser/extensions/browser_context_keyed_service_factories.cc
index 5830c48..56fea52 100644
--- a/chrome/browser/extensions/browser_context_keyed_service_factories.cc
+++ b/chrome/browser/extensions/browser_context_keyed_service_factories.cc
@@ -15,11 +15,11 @@
 #include "chrome/browser/extensions/api/developer_private/developer_private_api.h"
 #include "chrome/browser/extensions/api/dial/dial_api_factory.h"
 #include "chrome/browser/extensions/api/extension_action/extension_action_api.h"
-#include "chrome/browser/extensions/api/feedback_private/feedback_private_api.h"
+//#include "chrome/browser/extensions/api/feedback_private/feedback_private_api.h"
 #include "chrome/browser/extensions/api/font_settings/font_settings_api.h"
-#include "chrome/browser/extensions/api/gcd_private/gcd_private_api.h"
+//#include "chrome/browser/extensions/api/gcd_private/gcd_private_api.h"
 #include "chrome/browser/extensions/api/history/history_api.h"
-#include "chrome/browser/extensions/api/hotword_private/hotword_private_api.h"
+//#include "chrome/browser/extensions/api/hotword_private/hotword_private_api.h"
 #include "chrome/browser/extensions/api/identity/identity_api.h"
 #include "chrome/browser/extensions/api/location/location_manager.h"
 #include "chrome/browser/extensions/api/mdns/mdns_api.h"
@@ -36,11 +36,11 @@
 #include "chrome/browser/extensions/api/tab_capture/tab_capture_registry.h"
 #include "chrome/browser/extensions/api/tabs/tabs_windows_api.h"
 #include "chrome/browser/extensions/api/web_navigation/web_navigation_api.h"
-#include "chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_api.h"
+//#include "chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_api.h"
 #include "chrome/browser/extensions/api/webstore/webstore_api.h"
 #include "chrome/browser/extensions/extension_garbage_collector_factory.h"
 #include "chrome/browser/extensions/extension_gcm_app_handler.h"
-#include "chrome/browser/extensions/extension_storage_monitor_factory.h"
+//#include "chrome/browser/extensions/extension_storage_monitor_factory.h"
 #include "chrome/browser/extensions/extension_system_factory.h"
 #include "chrome/browser/extensions/extension_toolbar_model_factory.h"
 #include "chrome/browser/extensions/extension_web_ui_override_registrar.h"
@@ -51,12 +51,12 @@
 #include "chrome/browser/extensions/warning_badge_service_factory.h"
 #include "chrome/browser/speech/extension_api/tts_extension_api.h"
 #include "extensions/browser/api/api_resource_manager.h"
-#include "extensions/browser/api/bluetooth/bluetooth_api.h"
-#include "extensions/browser/api/bluetooth/bluetooth_private_api.h"
-#include "extensions/browser/api/bluetooth_low_energy/bluetooth_low_energy_api.h"
-#include "extensions/browser/api/bluetooth_socket/bluetooth_socket_event_dispatcher.h"
+//#include "extensions/browser/api/bluetooth/bluetooth_api.h"
+//#include "extensions/browser/api/bluetooth/bluetooth_private_api.h"
+//#include "extensions/browser/api/bluetooth_low_energy/bluetooth_low_energy_api.h"
+//#include "extensions/browser/api/bluetooth_socket/bluetooth_socket_event_dispatcher.h"
 #include "extensions/browser/api/power/power_api.h"
-#include "extensions/browser/api/usb/usb_device_resource.h"
+//#include "extensions/browser/api/usb/usb_device_resource.h"
 #include "extensions/browser/api/virtual_keyboard_private/virtual_keyboard_private_api.h"
 #include "extensions/browser/api/web_request/web_request_api.h"
 
@@ -77,13 +77,13 @@ namespace chrome_extensions {
 void EnsureBrowserContextKeyedServiceFactoriesBuilt() {
   extensions::ActivityLog::GetFactoryInstance();
   extensions::ActivityLogAPI::GetFactoryInstance();
-  extensions::ApiResourceManager<
-      extensions::UsbDeviceResource>::GetFactoryInstance();
+//  extensions::ApiResourceManager<
+//      extensions::UsbDeviceResource>::GetFactoryInstance();
   extensions::BookmarksAPI::GetFactoryInstance();
   extensions::BookmarkManagerPrivateAPI::GetFactoryInstance();
-  extensions::BluetoothAPI::GetFactoryInstance();
-  extensions::BluetoothLowEnergyAPI::GetFactoryInstance();
-  extensions::BluetoothPrivateAPI::GetFactoryInstance();
+//  extensions::BluetoothAPI::GetFactoryInstance();
+//  extensions::BluetoothLowEnergyAPI::GetFactoryInstance();
+//  extensions::BluetoothPrivateAPI::GetFactoryInstance();
   extensions::BrailleDisplayPrivateAPI::GetFactoryInstance();
   extensions::chromedirectsetting::ChromeDirectSettingAPI::GetFactoryInstance();
   extensions::CommandService::GetFactoryInstance();
@@ -93,15 +93,15 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() {
   extensions::DialAPIFactory::GetInstance();
   extensions::ExtensionActionAPI::GetFactoryInstance();
   extensions::ExtensionGarbageCollectorFactory::GetInstance();
-  extensions::ExtensionStorageMonitorFactory::GetInstance();
+//  extensions::ExtensionStorageMonitorFactory::GetInstance();
   extensions::ExtensionSystemFactory::GetInstance();
   extensions::ExtensionToolbarModelFactory::GetInstance();
   extensions::ExtensionWebUIOverrideRegistrar::GetFactoryInstance();
-  extensions::FeedbackPrivateAPI::GetFactoryInstance();
+//  extensions::FeedbackPrivateAPI::GetFactoryInstance();
   extensions::FontSettingsAPI::GetFactoryInstance();
-  extensions::GcdPrivateAPI::GetFactoryInstance();
+//  extensions::GcdPrivateAPI::GetFactoryInstance();
   extensions::HistoryAPI::GetFactoryInstance();
-  extensions::HotwordPrivateEventService::GetFactoryInstance();
+//  extensions::HotwordPrivateEventService::GetFactoryInstance();
   extensions::IdentityAPI::GetFactoryInstance();
   extensions::InstallTrackerFactory::GetInstance();
 #if defined(OS_CHROMEOS)
@@ -142,14 +142,14 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() {
   extensions::WarningBadgeServiceFactory::GetInstance();
   extensions::WebNavigationAPI::GetFactoryInstance();
   extensions::WebRequestAPI::GetFactoryInstance();
-  extensions::WebrtcAudioPrivateEventService::GetFactoryInstance();
+ // extensions::WebrtcAudioPrivateEventService::GetFactoryInstance();
   extensions::WebstoreAPI::GetFactoryInstance();
 #if defined(OS_CHROMEOS)
   file_manager::EventRouterFactory::GetInstance();
 #endif
   TokenCacheServiceFactory::GetInstance();
   extensions::ExtensionGCMAppHandler::GetFactoryInstance();
-  extensions::core_api::BluetoothSocketEventDispatcher::GetFactoryInstance();
+//  extensions::core_api::BluetoothSocketEventDispatcher::GetFactoryInstance();
 }
 
 }  // namespace chrome_extensions
diff --git a/chrome/browser/extensions/component_loader.cc b/chrome/browser/extensions/component_loader.cc
index 3c40959..e0e047e 100644
--- a/chrome/browser/extensions/component_loader.cc
+++ b/chrome/browser/extensions/component_loader.cc
@@ -16,8 +16,8 @@
 #include "base/trace_event/trace_event.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/pdf/pdf_extension_util.h"
-#include "chrome/browser/search/hotword_service.h"
-#include "chrome/browser/search/hotword_service_factory.h"
+//#include "chrome/browser/search/hotword_service.h"
+//#include "chrome/browser/search/hotword_service_factory.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_version_info.h"
@@ -326,7 +326,7 @@ void ComponentLoader::AddGalleryExtension() {
 #endif
 }
 
-void ComponentLoader::AddHangoutServicesExtension() {
+/*void ComponentLoader::AddHangoutServicesExtension() {
 #if defined(GOOGLE_CHROME_BUILD) || defined(ENABLE_HANGOUT_SERVICES_EXTENSION)
   Add(IDR_HANGOUT_SERVICES_MANIFEST,
       base::FilePath(FILE_PATH_LITERAL("hangout_services")));
@@ -351,7 +351,7 @@ void ComponentLoader::AddHotwordHelperExtension() {
           base::FilePath(FILE_PATH_LITERAL("hotword_helper")));
     }
   }
-}
+}*/
 
 void ComponentLoader::AddImageLoaderExtension() {
 #if defined(IMAGE_LOADER_EXTENSION)
@@ -546,9 +546,9 @@ void ComponentLoader::AddDefaultComponentExtensionsWithBackgroundPages(
     AddFileManagerExtension();
     AddGalleryExtension();
 
-    AddHangoutServicesExtension();
-    AddHotwordAudioVerificationApp();
-    AddHotwordHelperExtension();
+//    AddHangoutServicesExtension();
+//    AddHotwordAudioVerificationApp();
+//    AddHotwordHelperExtension();
     AddImageLoaderExtension();
 
     bool install_feedback = enable_background_extensions_during_testing;
diff --git a/chrome/browser/extensions/crx_installer.cc b/chrome/browser/extensions/crx_installer.cc
index c76a45d..32a849a 100644
--- a/chrome/browser/extensions/crx_installer.cc
+++ b/chrome/browser/extensions/crx_installer.cc
@@ -544,7 +544,7 @@ void CrxInstaller::OnInstallChecksComplete(int failed_checks) {
   }
 
   // Check the blacklist state.
-  if (install_checker_.blacklist_state() == extensions::BLACKLISTED_MALWARE) {
+/*  if (install_checker_.blacklist_state() == extensions::BLACKLISTED_MALWARE) {
     install_flags_ |= kInstallFlagIsBlacklistedForMalware;
   }
 
@@ -561,7 +561,7 @@ void CrxInstaller::OnInstallChecksComplete(int failed_checks) {
                               extension()->location(),
                               Manifest::NUM_LOCATIONS);
     return;
-  }
+  }*/
 
   // NOTE: extension may still be blacklisted, but we're forced to silently
   // install it. In this case, ExtensionService::OnExtensionInstalled needs to
diff --git a/chrome/browser/extensions/extension_install_checker.cc b/chrome/browser/extensions/extension_install_checker.cc
index 313225df..5c9911a 100644
--- a/chrome/browser/extensions/extension_install_checker.cc
+++ b/chrome/browser/extensions/extension_install_checker.cc
@@ -5,7 +5,7 @@
 #include "chrome/browser/extensions/extension_install_checker.h"
 
 #include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/extensions/blacklist.h"
+//#include "chrome/browser/extensions/blacklist.h"
 #include "chrome/browser/extensions/chrome_requirements_checker.h"
 #include "chrome/browser/profiles/profile.h"
 #include "content/public/browser/browser_thread.h"
@@ -16,7 +16,7 @@ namespace extensions {
 
 ExtensionInstallChecker::ExtensionInstallChecker(Profile* profile)
     : profile_(profile),
-      blacklist_state_(NOT_BLACKLISTED),
+//      blacklist_state_(NOT_BLACKLISTED),
       policy_allows_load_(true),
       current_sequence_number_(0),
       running_checks_(0),
@@ -62,8 +62,8 @@ void ExtensionInstallChecker::Start(int enabled_checks,
       return;
   }
 
-  if (enabled_checks & CHECK_BLACKLIST)
-    CheckBlacklistState();
+//  if (enabled_checks & CHECK_BLACKLIST)
+//    CheckBlacklistState();
 }
 
 void ExtensionInstallChecker::CheckManagementPolicy() {
@@ -111,7 +111,7 @@ void ExtensionInstallChecker::OnRequirementsCheckDone(
   MaybeInvokeCallback();
 }
 
-void ExtensionInstallChecker::CheckBlacklistState() {
+/*void ExtensionInstallChecker::CheckBlacklistState() {
   DCHECK(extension_.get());
 
   extensions::Blacklist* blacklist = Blacklist::Get(profile_);
@@ -133,10 +133,10 @@ void ExtensionInstallChecker::OnBlacklistStateCheckDone(int sequence_number,
   running_checks_ &= ~CHECK_BLACKLIST;
   MaybeInvokeCallback();
 }
-
+*/
 void ExtensionInstallChecker::ResetResults() {
   requirement_errors_.clear();
-  blacklist_state_ = NOT_BLACKLISTED;
+//  blacklist_state_ = NOT_BLACKLISTED;
   policy_allows_load_ = true;
   policy_error_.clear();
 }
@@ -147,8 +147,8 @@ void ExtensionInstallChecker::MaybeInvokeCallback() {
 
   // Set bits for failed checks.
   int failed_mask = 0;
-  if (blacklist_state_ == BLACKLISTED_MALWARE)
-    failed_mask |= CHECK_BLACKLIST;
+//  if (blacklist_state_ == BLACKLISTED_MALWARE)
+//    failed_mask |= CHECK_BLACKLIST;
   if (!requirement_errors_.empty())
     failed_mask |= CHECK_REQUIREMENTS;
   if (!policy_allows_load_)
diff --git a/chrome/browser/extensions/extension_install_checker.h b/chrome/browser/extensions/extension_install_checker.h
index a13bdff..809086c 100644
--- a/chrome/browser/extensions/extension_install_checker.h
+++ b/chrome/browser/extensions/extension_install_checker.h
@@ -12,7 +12,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string16.h"
-#include "extensions/browser/blacklist_state.h"
+//#include "extensions/browser/blacklist_state.h"
 #include "extensions/common/extension.h"
 
 class Profile;
@@ -72,7 +72,7 @@ class ExtensionInstallChecker {
 
   // Returns the blacklist state of the extension. A blacklist state of
   // BLACKLISTED_MALWARE is considered to be a check failure.
-  BlacklistState blacklist_state() const { return blacklist_state_; }
+//  BlacklistState blacklist_state() const { return blacklist_state_; }
 
   // Returns whether management policy permits installation of the extension.
   bool policy_allows_load() const { return policy_allows_load_; }
@@ -86,8 +86,8 @@ class ExtensionInstallChecker {
   void OnRequirementsCheckDone(int sequence_number,
                                const std::vector<std::string>& errors);
 
-  virtual void CheckBlacklistState();
-  void OnBlacklistStateCheckDone(int sequence_number, BlacklistState state);
+//  virtual void CheckBlacklistState();
+//  void OnBlacklistStateCheckDone(int sequence_number, BlacklistState state);
 
   virtual void ResetResults();
   int current_sequence_number() const { return current_sequence_number_; }
@@ -107,7 +107,7 @@ class ExtensionInstallChecker {
   std::vector<std::string> requirement_errors_;
 
   // Result of the blacklist state check.
-  BlacklistState blacklist_state_;
+//  BlacklistState blacklist_state_;
 
   // Whether the extension can be installed, according to management policies.
   bool policy_allows_load_;
diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
index e2dc5b3..d867449 100644
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -166,14 +166,14 @@ void ExtensionService::AddProviderForTesting(
   external_extension_providers_.push_back(
       linked_ptr<extensions::ExternalProviderInterface>(test_provider));
 }
-
+/*
 void ExtensionService::BlacklistExtensionForTest(
     const std::string& extension_id) {
   ExtensionIdSet blacklisted;
   ExtensionIdSet unchanged;
   blacklisted.insert(extension_id);
   UpdateBlacklistedExtensions(blacklisted, unchanged);
-}
+}*/
 
 bool ExtensionService::OnExternalExtensionUpdateUrlFound(
     const std::string& id,
@@ -251,15 +251,15 @@ ExtensionService::ExtensionService(Profile* profile,
                                    const base::CommandLine* command_line,
                                    const base::FilePath& install_directory,
                                    extensions::ExtensionPrefs* extension_prefs,
-                                   extensions::Blacklist* blacklist,
+//                                   extensions::Blacklist* blacklist,
                                    bool autoupdate_enabled,
                                    bool extensions_enabled,
                                    extensions::OneShotEvent* ready)
-    : extensions::Blacklist::Observer(blacklist),
+    : //extensions::Blacklist::Observer(blacklist),
       profile_(profile),
       system_(extensions::ExtensionSystem::Get(profile)),
       extension_prefs_(extension_prefs),
-      blacklist_(blacklist),
+//      blacklist_(blacklist),
       extension_sync_service_(NULL),
       registry_(extensions::ExtensionRegistry::Get(profile)),
       pending_extension_manager_(profile),
@@ -1085,11 +1085,11 @@ void ExtensionService::NotifyExtensionLoaded(const Extension* extension) {
     content::URLDataSource::Add(profile_, favicon_source);
   }
 
-  // Same for chrome://theme/ resources.
+/*  // Same for chrome://theme/ resources.
   if (permissions_data->HasHostPermission(GURL(chrome::kChromeUIThemeURL))) {
     ThemeSource* theme_source = new ThemeSource(profile_);
     content::URLDataSource::Add(profile_, theme_source);
-  }
+  }*/
 
   // Same for chrome://thumb/ resources.
   if (permissions_data->HasHostPermission(
@@ -1437,7 +1437,7 @@ void ExtensionService::OnLoadedInstalledExtensions() {
   if (updater_)
     updater_->Start();
 
-  OnBlacklistUpdated();
+//  OnBlacklistUpdated();
 }
 
 void ExtensionService::AddExtension(const Extension* extension) {
@@ -2397,7 +2397,7 @@ void ExtensionService::MaybeFinishDelayedInstallations() {
   }
 }
 
-void ExtensionService::OnBlacklistUpdated() {
+/*void ExtensionService::OnBlacklistUpdated() {
   blacklist_->GetBlacklistedIDs(
       registry_->GenerateInstalledExtensionsSet()->GetIDs(),
       base::Bind(&ExtensionService::ManageBlacklist, AsWeakPtr()));
@@ -2438,7 +2438,7 @@ void ExtensionService::ManageBlacklist(
   UpdateGreylistedExtensions(greylist, unchanged, state_map);
 
   error_controller_->ShowErrorIfNeeded();
-}
+}*/
 
 namespace {
 void Partition(const ExtensionIdSet& before,
@@ -2452,7 +2452,7 @@ void Partition(const ExtensionIdSet& before,
 }
 }  // namespace
 
-void ExtensionService::UpdateBlacklistedExtensions(
+/*void ExtensionService::UpdateBlacklistedExtensions(
     const ExtensionIdSet& blacklisted,
     const ExtensionIdSet& unchanged) {
   ExtensionIdSet not_yet_blocked, no_longer_blocked;
@@ -2534,7 +2534,7 @@ void ExtensionService::UpdateGreylistedExtensions(
     if (registry_->enabled_extensions().Contains(extension->id()))
       DisableExtension(*it, extensions::Extension::DISABLE_GREYLIST);
   }
-}
+}*/
 
 void ExtensionService::AddUpdateObserver(extensions::UpdateObserver* observer) {
   update_observers_.AddObserver(observer);
diff --git a/chrome/browser/extensions/extension_service.h b/chrome/browser/extensions/extension_service.h
index 04d0f4e..b21b18b 100644
--- a/chrome/browser/extensions/extension_service.h
+++ b/chrome/browser/extensions/extension_service.h
@@ -16,7 +16,8 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string16.h"
-#include "chrome/browser/extensions/blacklist.h"
+//#include "chrome/browser/extensions/blacklist.h"
+ #include "extensions/browser/extension_prefs.h"
 #include "chrome/browser/extensions/extension_management.h"
 #include "chrome/browser/extensions/pending_extension_manager.h"
 #include "content/public/browser/notification_observer.h"
@@ -176,7 +177,7 @@ class ExtensionService
     : public ExtensionServiceInterface,
       public extensions::ExternalProviderInterface::VisitorInterface,
       public content::NotificationObserver,
-      public extensions::Blacklist::Observer,
+//      public extensions::Blacklist::Observer,
       public extensions::ExtensionManagement::Observer {
  public:
   // Attempts to uninstall an extension from a given ExtensionService. Returns
@@ -191,7 +192,7 @@ class ExtensionService
                    const base::CommandLine* command_line,
                    const base::FilePath& install_directory,
                    extensions::ExtensionPrefs* extension_prefs,
-                   extensions::Blacklist* blacklist,
+//                   extensions::Blacklist* blacklist,
                    bool autoupdate_enabled,
                    bool extensions_enabled,
                    extensions::OneShotEvent* ready);
@@ -444,7 +445,7 @@ class ExtensionService
       extensions::ExternalProviderInterface* test_provider);
 
   // Simulate an extension being blacklisted for tests.
-  void BlacklistExtensionForTest(const std::string& extension_id);
+//  void BlacklistExtensionForTest(const std::string& extension_id);
 
 #if defined(UNIT_TEST)
   void TrackTerminatedExtensionForTest(const extensions::Extension* extension) {
@@ -491,7 +492,7 @@ class ExtensionService
                const content::NotificationDetails& details) override;
 
   // extensions::Blacklist::Observer implementation.
-  void OnBlacklistUpdated() override;
+//  void OnBlacklistUpdated() override;
 
   // Similar to FinishInstallation, but first checks if there still is an update
   // pending for the extension, and makes sure the extension is still idle.
@@ -577,7 +578,7 @@ class ExtensionService
 
   // Manages the blacklisted extensions, intended as callback from
   // Blacklist::GetBlacklistedIDs.
-  void ManageBlacklist(
+/*  void ManageBlacklist(
       const extensions::Blacklist::BlacklistStateMap& blacklisted_ids);
 
   // Add extensions in |blacklisted| to blacklisted_extensions, remove
@@ -590,7 +591,7 @@ class ExtensionService
       const extensions::ExtensionIdSet& greylist,
       const extensions::ExtensionIdSet& unchanged,
       const extensions::Blacklist::BlacklistStateMap& state_map);
-
+*/
   // Used only by test code.
   void UnloadAllExtensionsInternal();
 
@@ -616,7 +617,7 @@ class ExtensionService
   extensions::ExtensionPrefs* extension_prefs_;
 
   // Blacklist for the owning profile.
-  extensions::Blacklist* blacklist_;
+//  extensions::Blacklist* blacklist_;
 
   // The ExtensionSyncService that is used by this ExtensionService.
   ExtensionSyncService* extension_sync_service_;
diff --git a/chrome/browser/extensions/extension_system_factory.cc b/chrome/browser/extensions/extension_system_factory.cc
index c80f79c..3679a51 100644
--- a/chrome/browser/extensions/extension_system_factory.cc
+++ b/chrome/browser/extensions/extension_system_factory.cc
@@ -4,7 +4,7 @@
 
 #include "chrome/browser/extensions/extension_system_factory.h"
 
-#include "chrome/browser/extensions/blacklist_factory.h"
+//#include "chrome/browser/extensions/blacklist_factory.h"
 #include "chrome/browser/extensions/extension_management.h"
 #include "chrome/browser/policy/profile_policy_connector_factory.h"
 #include "chrome/browser/profiles/profile.h"
@@ -47,7 +47,7 @@ ExtensionSystemSharedFactory::ExtensionSystemSharedFactory()
   DependsOn(policy::ProfilePolicyConnectorFactory::GetInstance());
   DependsOn(ProcessManagerFactory::GetInstance());
   DependsOn(RendererStartupHelperFactory::GetInstance());
-  DependsOn(BlacklistFactory::GetInstance());
+//  DependsOn(BlacklistFactory::GetInstance());
   // This depends on ExtensionDownloader which depends on
   // ProfileIdentityProvider which depends on SigninManager.
   DependsOn(SigninManagerFactory::GetInstance());
diff --git a/chrome/browser/extensions/extension_system_impl.cc b/chrome/browser/extensions/extension_system_impl.cc
index 625c95b..ba252c7 100644
--- a/chrome/browser/extensions/extension_system_impl.cc
+++ b/chrome/browser/extensions/extension_system_impl.cc
@@ -319,7 +319,7 @@ void ExtensionSystemImpl::Shared::Init(bool extensions_enabled) {
   extension_service_.reset(new ExtensionService(
       profile_, base::CommandLine::ForCurrentProcess(),
       profile_->GetPath().AppendASCII(extensions::kInstallDirectoryName),
-      ExtensionPrefs::Get(profile_), Blacklist::Get(profile_),
+      ExtensionPrefs::Get(profile_), //Blacklist::Get(profile_),
       autoupdate_enabled, extensions_enabled, &ready_));
 
   // These services must be registered before the ExtensionService tries to
diff --git a/chrome/browser/extensions/plugin_manager.cc b/chrome/browser/extensions/plugin_manager.cc
index 2384d71..590fbc0 100644
--- a/chrome/browser/extensions/plugin_manager.cc
+++ b/chrome/browser/extensions/plugin_manager.cc
@@ -13,13 +13,13 @@
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/api/plugins/plugins_handler.h"
 #include "content/public/browser/plugin_service.h"
-#include "content/public/common/pepper_plugin_info.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/manifest_handlers/mime_types_handler.h"
 #include "url/gurl.h"
 
 #if !defined(DISABLE_NACL)
+#include "content/public/common/pepper_plugin_info.h"
 #include "components/nacl/common/nacl_constants.h"
 #endif
 
diff --git a/chrome/browser/lifetime/application_lifetime_aura.cc b/chrome/browser/lifetime/application_lifetime_aura.cc
index 75d67ba..0f180aa 100644
--- a/chrome/browser/lifetime/application_lifetime_aura.cc
+++ b/chrome/browser/lifetime/application_lifetime_aura.cc
@@ -4,7 +4,9 @@
 
 #include "chrome/browser/lifetime/application_lifetime.h"
 
-#include "ash/shell.h"
+#if defined(ASH_IMPLEMENTATION)
+  #include "ash/shell.h"
+#endif
 #include "base/command_line.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/notifications/notification_ui_manager.h"
@@ -20,6 +22,7 @@ void HandleAppExitingForPlatform() {
   // and windows created by Ash (launcher, background, etc).
   g_browser_process->notification_ui_manager()->CancelAll();
 
+#if defined(ASH_IMPLEMENTATION)
   // This may be called before |ash::Shell| is initialized when
   // XIOError is reported.  crbug.com/150633.
   if (ash::Shell::HasInstance()) {
@@ -28,6 +31,7 @@ void HandleAppExitingForPlatform() {
     aura::client::GetCaptureClient(ash::Shell::GetPrimaryRootWindow())->
         SetCapture(NULL);
   }
+#endif
 
   views::Widget::CloseAllSecondaryWidgets();
 
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 2480526..9a3d373 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -24,7 +24,9 @@
 #include "chrome/browser/download/download_prefs.h"
 #include "chrome/browser/external_protocol/external_protocol_handler.h"
 #include "chrome/browser/first_run/first_run.h"
+//TODO:
 #include "chrome/browser/geolocation/geolocation_prefs.h"
+
 #include "chrome/browser/gpu/gl_string_manager.h"
 #include "chrome/browser/gpu/gpu_mode_manager.h"
 #include "chrome/browser/intranet_redirect_detector.h"
@@ -40,22 +42,26 @@
 #include "chrome/browser/net/predictor.h"
 #include "chrome/browser/net/pref_proxy_config_tracker_impl.h"
 #include "chrome/browser/net/ssl_config_service_manager.h"
+//TODO:
 #include "chrome/browser/notifications/desktop_notification_service.h"
 #include "chrome/browser/notifications/extension_welcome_notification.h"
 #include "chrome/browser/notifications/message_center_notification_manager.h"
-#include "chrome/browser/pepper_flash_settings_manager.h"
+//#include "chrome/browser/pepper_flash_settings_manager.h"
 #include "chrome/browser/plugins/plugin_finder.h"
+
 #include "chrome/browser/prefs/chrome_pref_service_factory.h"
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
 #include "chrome/browser/prefs/pref_service_syncable.h"
 #include "chrome/browser/prefs/session_startup_pref.h"
+//TODO:
 #include "chrome/browser/printing/print_dialog_cloud.h"
+
 #include "chrome/browser/profiles/chrome_version_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_impl.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profiles_state.h"
-#include "chrome/browser/renderer_host/pepper/device_id_fetcher.h"
+//#include "chrome/browser/renderer_host/pepper/device_id_fetcher.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/services/gcm/gcm_profile_service.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
@@ -119,7 +125,7 @@
 #include "chrome/browser/extensions/api/tabs/tabs_api.h"
 #include "chrome/browser/extensions/extension_web_ui.h"
 #include "chrome/browser/extensions/launch_util.h"
-#include "chrome/browser/signin/easy_unlock_service.h"
+//#include "chrome/browser/signin/easy_unlock_service.h"
 #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h"
 #include "extensions/browser/extension_prefs.h"
 #if !defined(OS_ANDROID) && !defined(OS_IOS)
@@ -128,6 +134,7 @@
 #endif  // defined(ENABLE_EXTENSIONS)
 
 #if defined(ENABLE_PLUGIN_INSTALLATION)
+1
 #include "chrome/browser/plugins/plugins_resource_service.h"
 #endif
 
@@ -274,7 +281,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
 #endif
 
 #if defined(ENABLE_EXTENSIONS)
-  EasyUnlockService::RegisterPrefs(registry);
+//  EasyUnlockService::RegisterPrefs(registry);
 #endif
 
 #if defined(ENABLE_NOTIFICATIONS) && !defined(OS_ANDROID)
@@ -296,7 +303,9 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
 
 #if !defined(OS_ANDROID)
   AutomaticProfileResetterFactory::RegisterPrefs(registry);
+#if defined(ENABLE_BACKGROUND)
   BackgroundModeManager::RegisterPrefs(registry);
+#endif
   RegisterBrowserPrefs(registry);
   // The native GCM is used on Android instead.
   gcm::GCMChannelStatusSyncer::RegisterPrefs(registry);
@@ -417,7 +426,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
 #endif
 
 #if defined(ENABLE_EXTENSIONS)
-  EasyUnlockService::RegisterProfilePrefs(registry);
+//  EasyUnlockService::RegisterProfilePrefs(registry);
   extensions::ActivityLog::RegisterProfilePrefs(registry);
   extensions::launch_util::RegisterProfilePrefs(registry);
   ExtensionWebUI::RegisterProfilePrefs(registry);
@@ -462,7 +471,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
 #else
   AppShortcutManager::RegisterProfilePrefs(registry);
   autofill::GeneratedCreditCardBubbleController::RegisterUserPrefs(registry);
-  DeviceIDFetcher::RegisterProfilePrefs(registry);
+//  DeviceIDFetcher::RegisterProfilePrefs(registry);
   DevToolsWindow::RegisterProfilePrefs(registry);
   DriveAppMapping::RegisterProfilePrefs(registry);
   extensions::CommandService::RegisterProfilePrefs(registry);
@@ -471,7 +480,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
   first_run::RegisterProfilePrefs(registry);
   gcm::GCMChannelStatusSyncer::RegisterProfilePrefs(registry);
   NewTabUI::RegisterProfilePrefs(registry);
-  PepperFlashSettingsManager::RegisterProfilePrefs(registry);
+//  PepperFlashSettingsManager::RegisterProfilePrefs(registry);
   PinnedTabCodec::RegisterProfilePrefs(registry);
   PluginsUI::RegisterProfilePrefs(registry);
   RegisterAutolaunchUserPrefs(registry);
diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
index 9271d9e..89448d3 100644
--- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
+++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
@@ -6,7 +6,7 @@
 
 #include "chrome/browser/autocomplete/shortcuts_backend_factory.h"
 #include "chrome/browser/autofill/personal_data_manager_factory.h"
-#include "chrome/browser/background/background_contents_service_factory.h"
+//#include "chrome/browser/background/background_contents_service_factory.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/chrome_browser_main.h"
 #include "chrome/browser/content_settings/cookie_settings.h"
@@ -16,11 +16,15 @@
 #include "chrome/browser/download/download_service_factory.h"
 #include "chrome/browser/extensions/api/networking_private/networking_private_verify_delegate_factory_impl.h"
 #include "chrome/browser/favicon/favicon_service_factory.h"
+
+//TODO: get rid:
 #include "chrome/browser/geolocation/geolocation_permission_context_factory.h"
 #include "chrome/browser/google/google_url_tracker_factory.h"
+
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/invalidation/profile_invalidation_provider_factory.h"
 #include "chrome/browser/media_galleries/media_galleries_preferences_factory.h"
+//TODO: get rid:
 #include "chrome/browser/notifications/desktop_notification_service_factory.h"
 #include "chrome/browser/password_manager/password_store_factory.h"
 #include "chrome/browser/plugins/plugin_prefs_factory.h"
@@ -31,7 +35,8 @@
 #include "chrome/browser/prerender/prerender_link_manager_factory.h"
 #include "chrome/browser/prerender/prerender_manager_factory.h"
 #include "chrome/browser/prerender/prerender_message_filter.h"
-#include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory.h"
+//#include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory.h"
+//TODO: what's this:
 #include "chrome/browser/profiles/gaia_info_update_service_factory.h"
 #include "chrome/browser/search/instant_service_factory.h"
 #include "chrome/browser/search/suggestions/suggestions_service_factory.h"
@@ -39,11 +44,13 @@
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/sessions/session_service_factory.h"
 #include "chrome/browser/sessions/tab_restore_service_factory.h"
+//TODO: get rid of this:
 #include "chrome/browser/signin/about_signin_internals_factory.h"
 #include "chrome/browser/signin/account_tracker_service_factory.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
-#include "chrome/browser/themes/theme_service_factory.h"
+
+//#include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/thumbnails/thumbnail_service_factory.h"
 #include "chrome/browser/ui/app_list/app_list_syncable_service_factory.h"
 #include "chrome/browser/ui/find_bar/find_bar_state_factory.h"
@@ -53,6 +60,7 @@
 #include "chrome/browser/ui/webui/ntp/ntp_resource_cache_factory.h"
 #include "chrome/browser/undo/bookmark_undo_service_factory.h"
 #include "chrome/browser/webdata/web_data_service_factory.h"
+//#TODO: what is this:
 #include "extensions/browser/api/networking_private/networking_private_delegate_factory.h"
 
 #if defined(ENABLE_EXTENSIONS)
@@ -61,8 +69,8 @@
 #include "chrome/browser/apps/shortcut_manager_factory.h"
 #include "chrome/browser/extensions/browser_context_keyed_service_factories.h"
 #include "chrome/browser/extensions/extension_management.h"
-#include "chrome/browser/search/hotword_service_factory.h"
-#include "chrome/browser/signin/easy_unlock_service_factory.h"
+//#include "chrome/browser/search/hotword_service_factory.h"
+//#include "chrome/browser/signin/easy_unlock_service_factory.h"
 #include "chrome/browser/ui/bookmarks/enhanced_bookmark_key_service_factory.h"
 #include "extensions/browser/browser_context_keyed_service_factories.h"
 #endif
@@ -190,7 +198,7 @@ EnsureBrowserContextKeyedServiceFactoriesBuilt() {
   domain_reliability::DomainReliabilityServiceFactory::GetInstance();
   DownloadServiceFactory::GetInstance();
 #if defined(ENABLE_EXTENSIONS)
-  EasyUnlockServiceFactory::GetInstance();
+//  EasyUnlockServiceFactory::GetInstance();
   EnhancedBookmarkKeyServiceFactory::GetInstance();
 #endif
   FaviconServiceFactory::GetInstance();
@@ -203,7 +211,7 @@ EnsureBrowserContextKeyedServiceFactoriesBuilt() {
   GoogleURLTrackerFactory::GetInstance();
   HistoryServiceFactory::GetInstance();
 #if defined(ENABLE_EXTENSIONS)
-  HotwordServiceFactory::GetInstance();
+//  HotwordServiceFactory::GetInstance();
 #endif
   invalidation::ProfileInvalidationProviderFactory::GetInstance();
   InstantServiceFactory::GetInstance();
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
index 05bd533..6cecbdb 100644
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -60,7 +60,9 @@
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/profiles/profile_metrics.h"
-#include "chrome/browser/safe_browsing/safe_browsing_service.h"
+#if defined(OS_ANDROID) && defined(FULL_SAFE_BROWSING)
+  #include "chrome/browser/safe_browsing/safe_browsing_service.h"
+#endif
 #include "chrome/browser/services/gcm/gcm_profile_service.h"
 #include "chrome/browser/services/gcm/gcm_profile_service_factory.h"
 #include "chrome/browser/services/gcm/push_messaging_service_impl.h"
@@ -483,13 +485,17 @@ ProfileImpl::ProfileImpl(
       path_, sequenced_task_runner, create_mode == CREATE_MODE_SYNCHRONOUS);
 #endif
 
+#if defined(OS_ANDROID) && defined(FULL_SAFE_BROWSING)
   scoped_refptr<SafeBrowsingService> safe_browsing_service(
       g_browser_process->safe_browsing_service());
   if (safe_browsing_service.get()) {
-    pref_validation_delegate_ =
+#else
+    pref_validation_delegate_ = scoped_ptr<TrackedPreferenceValidationDelegate>().Pass();
+#endif
+#if defined(OS_ANDROID) && defined(FULL_SAFE_BROWSING)
         safe_browsing_service->CreatePreferenceValidationDelegate(this).Pass();
   }
-
+#endif
   {
     // On startup, preference loading is always synchronous so a scoped timer
     // will work here.
diff --git a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
index 715ddcc..85a0fd4 100644
--- a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
+++ b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
@@ -25,8 +25,10 @@
 #include "chrome/browser/prerender/prerender_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_io_data.h"
-#include "chrome/browser/renderer_host/safe_browsing_resource_throttle_factory.h"
-#include "chrome/browser/safe_browsing/safe_browsing_service.h"
+#if defined(FULL_SAFE_BROWSING) || defined(MOBILE_SAFE_BROWSING)
+  //#include "chrome/browser/renderer_host/safe_browsing_resource_throttle_factory.h"
+  //#include "chrome/browser/safe_browsing/safe_browsing_service.h"
+#endif
 #include "chrome/browser/signin/signin_header_helper.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/browser/ui/login/login_prompt.h"
@@ -217,6 +219,7 @@ bool IsPluginEnabledForExtension(const Extension* extension,
                                  const ResourceRequestInfo* info,
                                  const std::string& mime_type,
                                  const GURL& url) {
+#if defined(ENABLE_PLUGINS)
   content::PluginService* service = content::PluginService::GetInstance();
   std::vector<content::WebPluginInfo> plugins;
   service->GetPluginInfoArray(url, mime_type, true, &plugins, nullptr);
@@ -238,6 +241,7 @@ bool IsPluginEnabledForExtension(const Extension* extension,
       return true;
     }
   }
+#endif
   return false;
 }
 #endif  // !defined(ENABLE_EXTENSIONS)
@@ -304,7 +308,9 @@ void AppendComponentUpdaterThrottles(
 ChromeResourceDispatcherHostDelegate::ChromeResourceDispatcherHostDelegate(
     prerender::PrerenderTracker* prerender_tracker)
     : download_request_limiter_(g_browser_process->download_request_limiter()),
+#if defined(FULL_SAFE_BROWSING) || defined(MOBILE_SAFE_BROWSING)
       safe_browsing_(g_browser_process->safe_browsing_service()),
+#endif
 #if defined(ENABLE_EXTENSIONS)
       user_script_listener_(new extensions::UserScriptListener()),
 #endif
@@ -351,8 +357,10 @@ void ChromeResourceDispatcherHostDelegate::RequestBeginning(
     content::AppCacheService* appcache_service,
     ResourceType resource_type,
     ScopedVector<content::ResourceThrottle>* throttles) {
+#if defined(FULL_SAFE_BROWSING) || defined(MOBILE_SAFE_BROWSING)
   if (safe_browsing_.get())
     safe_browsing_->OnResourceRequest(request);
+#endif
 
   const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request);
   bool is_prerendering =
diff --git a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.h b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.h
index fc41b85..1d6b43d5 100644
--- a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.h
+++ b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.h
@@ -15,7 +15,7 @@
 
 class DelayedResourceQueue;
 class DownloadRequestLimiter;
-class SafeBrowsingService;
+//class SafeBrowsingService;
 
 namespace extensions {
 class UserScriptListener;
@@ -109,7 +109,7 @@ class ChromeResourceDispatcherHostDelegate
 #endif
 
   scoped_refptr<DownloadRequestLimiter> download_request_limiter_;
-  scoped_refptr<SafeBrowsingService> safe_browsing_;
+//  scoped_refptr<SafeBrowsingService> safe_browsing_;
 #if defined(ENABLE_EXTENSIONS)
   scoped_refptr<extensions::UserScriptListener> user_script_listener_;
   std::map<net::URLRequest*, StreamTargetInfo> stream_target_info_;
diff --git a/chrome/browser/renderer_preferences_util.cc b/chrome/browser/renderer_preferences_util.cc
index 68b5f45..0d1f264 100644
--- a/chrome/browser/renderer_preferences_util.cc
+++ b/chrome/browser/renderer_preferences_util.cc
@@ -87,7 +87,7 @@ void UpdateFromSystemSettings(content::RendererPreferences* prefs,
 #if defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS)
   views::LinuxUI* linux_ui = views::LinuxUI::instance();
   if (linux_ui) {
-    if (ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme()) {
+//    if (ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme()) {
       prefs->focus_ring_color = linux_ui->GetFocusRingColor();
       prefs->thumb_active_color = linux_ui->GetThumbActiveColor();
       prefs->thumb_inactive_color = linux_ui->GetThumbInactiveColor();
@@ -98,7 +98,7 @@ void UpdateFromSystemSettings(content::RendererPreferences* prefs,
         linux_ui->GetInactiveSelectionBgColor();
       prefs->inactive_selection_fg_color =
         linux_ui->GetInactiveSelectionFgColor();
-    }
+//    }
 
     // If we have a linux_ui object, set the caret blink interval regardless of
     // whether we're in native theme mode.
diff --git a/chrome/browser/resources/easy_unlock/manifest.json b/chrome/browser/resources/easy_unlock/manifest.json
index 526067b..8b47ff1 100644
--- a/chrome/browser/resources/easy_unlock/manifest.json
+++ b/chrome/browser/resources/easy_unlock/manifest.json
@@ -1,4 +1,4 @@
-{
+1
   "name": "Smart Lock",
   "description": "This app allows you to unlock your device when in proximity to your phone.",
   "version": "1.0",
diff --git a/chrome/browser/resources/easy_unlock/manifest_signin.json b/chrome/browser/resources/easy_unlock/manifest_signin.json
index 61ff3a8..cdb59cc 100644
--- a/chrome/browser/resources/easy_unlock/manifest_signin.json
+++ b/chrome/browser/resources/easy_unlock/manifest_signin.json
@@ -1,4 +1,4 @@
-{
+1
   "name": "Smart Lock",
   "description": "This app allows you to sign-in to a device when in proximity to your phone.",
   "version": "1.1",
diff --git a/chrome/browser/resources/options/autofill_options.js b/chrome/browser/resources/options/autofill_options.js
index ce9775d..bf90db3 100644
--- a/chrome/browser/resources/options/autofill_options.js
+++ b/chrome/browser/resources/options/autofill_options.js
@@ -10,7 +10,7 @@
  *   guid: string,
  *   nameOnCard: string
  * }}
- * @see chrome/browser/ui/webui/options/autofill_options_handler.cc
+ * 
  */
 var CreditCardData;
 
diff --git a/chrome/browser/search/instant_service.cc b/chrome/browser/search/instant_service.cc
index f02d656..8145797 100644
--- a/chrome/browser/search/instant_service.cc
+++ b/chrome/browser/search/instant_service.cc
@@ -190,7 +190,11 @@ void InstantService::UpdateThemeInfo() {
   // Update theme background info.
   // Initialize |theme_info| if necessary.
   if (!theme_info_)
+#if defined(ENABLE_THEMES)
     OnThemeChanged(ThemeServiceFactory::GetForProfile(profile_));
+#else
+  ;
+#endif
   else
     OnThemeChanged(NULL);
 }
diff --git a/chrome/browser/supervised_user/supervised_user_interstitial.cc b/chrome/browser/supervised_user/supervised_user_interstitial.cc
index 65798dc..e64af8d 100644
--- a/chrome/browser/supervised_user/supervised_user_interstitial.cc
+++ b/chrome/browser/supervised_user/supervised_user_interstitial.cc
@@ -318,6 +318,7 @@ void SupervisedUserInterstitial::CommandReceived(const std::string& command) {
   }
 
   if (command == "\"feedback\"") {
+  /*
     base::string16 reason = l10n_util::GetStringUTF16(
         SupervisedUserURLFilter::GetBlockMessageID(reason_));
     std::string message = l10n_util::GetStringFUTF8(
@@ -336,6 +337,7 @@ void SupervisedUserInterstitial::CommandReceived(const std::string& command) {
         message,
         bucket);
 #endif
+*/
     return;
   }
 
diff --git a/chrome/browser/task_manager/task_manager.cc b/chrome/browser/task_manager/task_manager.cc
index 0bf4708..7090424 100644
--- a/chrome/browser/task_manager/task_manager.cc
+++ b/chrome/browser/task_manager/task_manager.cc
@@ -255,10 +255,10 @@ TaskManagerModel::TaskManagerModel(TaskManager* task_manager)
       FROM_HERE_WITH_EXPLICIT_FUNCTION(
           "437890 TaskManagerModel::TaskManagerModel2"));
 
-  AddResourceProvider(new task_manager::WebContentsResourceProvider(
+/*  AddResourceProvider(new task_manager::WebContentsResourceProvider(
       task_manager,
       scoped_ptr<WebContentsInformation>(
-          new task_manager::BackgroundInformation())));
+          new task_manager::BackgroundInformation())));*/
 
   // TODO(vadimt): Remove ScopedTracker below once crbug.com/437890 is fixed.
   tracked_objects::ScopedTracker tracking_profile3(
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
index 538f50a..daddff5 100644
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -45,13 +45,13 @@ static_library("ui") {
     "//chrome/common",
     "//chrome/common/net",
     "//components/app_modal",
-    "//components/auto_login_parser",
+#    "//components/auto_login_parser",
     "//components/dom_distiller/webui",
-    "//components/feedback/proto",
+#    "//components/feedback/proto",
     "//components/history/core/browser:proto",
     "//components/invalidation",
     "//components/onc",
-    "//components/password_manager/core/browser",
+#    "//components/password_manager/core/browser",
     "//components/resources",
     "//components/strings",
     "//components/update_client",
@@ -95,22 +95,22 @@ static_library("ui") {
       "//chrome/browser/ui/views",
       "//chrome/browser/ui/webui/omnibox:mojo_bindings",
       "//chrome/installer/util",
-      "//components/autofill/content/browser:risk_proto",
+#      "//components/autofill/content/browser:risk_proto",
       "//components/power",
       "//components/suggestions/proto",
-      "//device/nfc",
+#      "//device/nfc",
       "//media",
       "//net:net_with_v8",
       "//storage/browser",
       "//storage/common",
       "//third_party/WebKit/public:resources",
-      "//third_party/adobe/flash:flapper_version_h",
+#      "//third_party/adobe/flash:flapper_version_h",
       "//third_party/expat",
       "//third_party/hunspell",
       "//third_party/leveldatabase",
       "//third_party/mojo/src/mojo/edk/system",
       "//third_party/npapi",
-      "//third_party/libjingle",
+#      "//third_party/libjingle",
       "//third_party/re2",
       "//ui/base/ime",
       "//ui/compositor",
@@ -133,11 +133,11 @@ static_library("ui") {
         rebase_path(gypi_values.chrome_browser_ui_omnibox_non_mobile_sources,
                     ".",
                     "//chrome")
-    deps += [
-      "//components/copresence",
-      "//device/bluetooth",
-      "//third_party/libusb",
-    ]
+#    deps += [
+#      "//components/copresence",
+#      "//device/bluetooth",
+#      "//third_party/libusb",
+#    ]
   }
 
   if (enable_basic_printing || enable_print_preview) {
@@ -393,7 +393,7 @@ static_library("ui") {
     sources += rebase_path(gypi_values.chrome_browser_ui_linux_sources,
                            ".",
                            "//chrome")
-    deps += [ "//device/udev_linux" ]
+#    deps += [ "//device/udev_linux" ]
     if (use_aura) {
       configs += [ "//build/config/linux:fontconfig" ]
       deps += [ "//dbus" ]
diff --git a/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc b/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc
index be88def..360009f 100644
--- a/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc
+++ b/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc
@@ -90,17 +90,21 @@ ChromeBrowserMainExtraPartsAura::~ChromeBrowserMainExtraPartsAura() {
 
 void ChromeBrowserMainExtraPartsAura::PreEarlyInitialization() {
 #if defined(USE_X11) && !defined(OS_CHROMEOS)
+#if defined(USE_ASH)
   if (GetInitialDesktop() != chrome::HOST_DESKTOP_TYPE_ASH) {
+#endif
     // TODO(erg): Refactor this into a dlopen call when we add a GTK3 port.
     views::LinuxUI* gtk2_ui = BuildGtk2UI();
     gtk2_ui->SetNativeThemeOverride(base::Bind(&GetNativeThemeForWindow));
     views::LinuxUI::SetInstance(gtk2_ui);
+#if defined(USE_ASH)
   } else {
     // TODO(erg): Eventually, we'll need to somehow support IMEs in ash on
     // Linux.
     ui::InitializeInputMethodForTesting();
   }
 #endif
+#endif
 }
 
 void ChromeBrowserMainExtraPartsAura::ToolkitInitialized() {
@@ -112,7 +116,9 @@ void ChromeBrowserMainExtraPartsAura::ToolkitInitialized() {
 #endif
 
 #if defined(USE_X11) && !defined(OS_CHROMEOS)
+#if defined(USE_ASH)
   if (GetInitialDesktop() != chrome::HOST_DESKTOP_TYPE_ASH)
+#endif
     views::LinuxUI::instance()->Initialize();
 #endif
 }
diff --git a/chrome/browser/ui/libgtk2ui/BUILD.gn b/chrome/browser/ui/libgtk2ui/BUILD.gn
index a8455be..a5197df 100644
--- a/chrome/browser/ui/libgtk2ui/BUILD.gn
+++ b/chrome/browser/ui/libgtk2ui/BUILD.gn
@@ -82,7 +82,7 @@ component("libgtk2ui") {
     ":gtk",
     ":gtkprint",
     "//build/config/linux:gconf",
-    "//printing:cups",
+#    "//printing:cups",
   ]
 
   # gn orders flags on a target before flags from configs. The default config
@@ -96,7 +96,7 @@ component("libgtk2ui") {
         "-Wno-unused-function",
 
         # G_STATIC_ASSERT uses a typedef as a static_assert.
-        "-Wno-unused-local-typedef",
+        "-Wno-unused-local-typedefs",
       ]
     }
   }
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 4679e50..20b3c7a 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -172,14 +172,14 @@
       'browser/app_icon_win.h',
       'browser/app_mode/app_mode_utils.cc',
       'browser/app_mode/app_mode_utils.h',
-      'browser/autofill/android/personal_data_manager_android.cc',
-      'browser/autofill/android/personal_data_manager_android.h',
-      'browser/autofill/personal_data_manager_factory.cc',
-      'browser/autofill/personal_data_manager_factory.h',
-      'browser/autofill/risk_util.cc',
-      'browser/autofill/risk_util.h',
-      'browser/autofill/validation_rules_storage_factory.cc',
-      'browser/autofill/validation_rules_storage_factory.h',
+#      'browser/autofill/android/personal_data_manager_android.cc',
+#      'browser/autofill/android/personal_data_manager_android.h',
+#      'browser/autofill/personal_data_manager_factory.cc',
+#      'browser/autofill/personal_data_manager_factory.h',
+#      'browser/autofill/risk_util.cc',
+#      'browser/autofill/risk_util.h',
+#      'browser/autofill/validation_rules_storage_factory.cc',
+#      'browser/autofill/validation_rules_storage_factory.h',
       'browser/banners/app_banner_metrics.cc',
       'browser/banners/app_banner_metrics.h',
       'browser/banners/app_banner_settings_helper.cc',
@@ -280,10 +280,10 @@
       'browser/component_updater/sw_reporter_installer_win.h',
       'browser/component_updater/swiftshader_component_installer.cc',
       'browser/component_updater/swiftshader_component_installer.h',
-      'browser/crash_upload_list.cc',
-      'browser/crash_upload_list.h',
-      'browser/crash_upload_list_win.cc',
-      'browser/crash_upload_list_win.h',
+#      'browser/crash_upload_list.cc',
+#      'browser/crash_upload_list.h',
+#      'browser/crash_upload_list_win.cc',
+#      'browser/crash_upload_list_win.h',
       'browser/custom_handlers/protocol_handler_registry.cc',
       'browser/custom_handlers/protocol_handler_registry.h',
       'browser/custom_handlers/protocol_handler_registry_factory.cc',
@@ -371,20 +371,20 @@
       'browser/fullscreen_chromeos.cc',
       'browser/fullscreen_mac.mm',
       'browser/fullscreen_win.cc',
-      'browser/geolocation/chrome_access_token_store.cc',
-      'browser/geolocation/chrome_access_token_store.h',
-      'browser/geolocation/geolocation_infobar_delegate.cc',
-      'browser/geolocation/geolocation_infobar_delegate.h',
-      'browser/geolocation/geolocation_permission_context.cc',
-      'browser/geolocation/geolocation_permission_context.h',
-      'browser/geolocation/geolocation_permission_context_android.cc',
-      'browser/geolocation/geolocation_permission_context_android.h',
-      'browser/geolocation/geolocation_permission_context_extensions.cc',
-      'browser/geolocation/geolocation_permission_context_extensions.h',
-      'browser/geolocation/geolocation_permission_context_factory.cc',
-      'browser/geolocation/geolocation_permission_context_factory.h',
-      'browser/geolocation/geolocation_prefs.cc',
-      'browser/geolocation/geolocation_prefs.h',
+#      'browser/geolocation/chrome_access_token_store.cc',
+#      'browser/geolocation/chrome_access_token_store.h',
+#      'browser/geolocation/geolocation_infobar_delegate.cc',
+#      'browser/geolocation/geolocation_infobar_delegate.h',
+#      'browser/geolocation/geolocation_permission_context.cc',
+#      'browser/geolocation/geolocation_permission_context.h',
+#      'browser/geolocation/geolocation_permission_context_android.cc',
+#      'browser/geolocation/geolocation_permission_context_android.h',
+#      'browser/geolocation/geolocation_permission_context_extensions.cc',
+#      'browser/geolocation/geolocation_permission_context_extensions.h',
+#      'browser/geolocation/geolocation_permission_context_factory.cc',
+#      'browser/geolocation/geolocation_permission_context_factory.h',
+#      'browser/geolocation/geolocation_prefs.cc',
+#      'browser/geolocation/geolocation_prefs.h',
       'browser/global_keyboard_shortcuts_mac.h',
       'browser/global_keyboard_shortcuts_mac.mm',
       'browser/gpu/gl_string_manager.cc',
@@ -508,10 +508,10 @@
       'browser/net/predictor_tab_helper.h',
       'browser/omnibox/omnibox_log.cc',
       'browser/omnibox/omnibox_log.h',
-      'browser/performance_monitor/performance_monitor.cc',
-      'browser/performance_monitor/performance_monitor.h',
-      'browser/performance_monitor/process_metrics_history.cc',
-      'browser/performance_monitor/process_metrics_history.h',
+#      'browser/performance_monitor/performance_monitor.cc',
+#      'browser/performance_monitor/performance_monitor.h',
+#      'browser/performance_monitor/process_metrics_history.cc',
+#      'browser/performance_monitor/process_metrics_history.h',
       'browser/platform_util.h',
       'browser/platform_util_android.cc',
       'browser/platform_util_chromeos.cc',
@@ -587,14 +587,14 @@
       'browser/renderer_preferences_util.h',
       'browser/resources_util.cc',
       'browser/resources_util.h',
-      'browser/safe_browsing/safe_browsing_tab_observer.cc',
-      'browser/safe_browsing/safe_browsing_tab_observer.h',
-      'browser/safe_browsing/srt_fetcher_win.cc',
-      'browser/safe_browsing/srt_fetcher_win.h',
-      'browser/safe_browsing/srt_field_trial_win.cc',
-      'browser/safe_browsing/srt_field_trial_win.h',
-      'browser/safe_browsing/srt_global_error_win.cc',
-      'browser/safe_browsing/srt_global_error_win.h',
+#      'browser/safe_browsing/safe_browsing_tab_observer.cc',
+#      'browser/safe_browsing/safe_browsing_tab_observer.h',
+#      'browser/safe_browsing/srt_fetcher_win.cc',
+#      'browser/safe_browsing/srt_fetcher_win.h',
+#      'browser/safe_browsing/srt_field_trial_win.cc',
+#      'browser/safe_browsing/srt_field_trial_win.h',
+#      'browser/safe_browsing/srt_global_error_win.cc',
+#      'browser/safe_browsing/srt_global_error_win.h',
       'browser/safe_json_parser.cc',
       'browser/safe_json_parser.h',
       'browser/search/contextual_search_policy_handler_android.cc',
@@ -629,20 +629,20 @@
       'browser/shell_integration_win.cc',
       'browser/site_details.cc',
       'browser/site_details.h',
-      'browser/speech/chrome_speech_recognition_manager_delegate.cc',
-      'browser/speech/chrome_speech_recognition_manager_delegate.h',
-      'browser/speech/tts_android.cc',
-      'browser/speech/tts_android.h',
-      'browser/speech/tts_chromeos.cc',
-      'browser/speech/tts_controller.h',
-      'browser/speech/tts_controller_impl.cc',
-      'browser/speech/tts_controller_impl.h',
-      'browser/speech/tts_mac.mm',
-      'browser/speech/tts_message_filter.cc',
-      'browser/speech/tts_message_filter.h',
-      'browser/speech/tts_platform.cc',
-      'browser/speech/tts_platform.h',
-      'browser/speech/tts_win.cc',
+#      'browser/speech/chrome_speech_recognition_manager_delegate.cc',
+#      'browser/speech/chrome_speech_recognition_manager_delegate.h',
+#      'browser/speech/tts_android.cc',
+#      'browser/speech/tts_android.h',
+#      'browser/speech/tts_chromeos.cc',
+#      'browser/speech/tts_controller.h',
+#      'browser/speech/tts_controller_impl.cc',
+#      'browser/speech/tts_controller_impl.h',
+#      'browser/speech/tts_mac.mm',
+#      'browser/speech/tts_message_filter.cc',
+#      'browser/speech/tts_message_filter.h',
+#      'browser/speech/tts_platform.cc',
+#      'browser/speech/tts_platform.h',
+#      'browser/speech/tts_win.cc',
       'browser/status_icons/status_icon.cc',
       'browser/status_icons/status_icon.h',
       'browser/status_icons/status_icon_menu_model.cc',
@@ -756,12 +756,12 @@
     ],
     # Used everywhere but ChromeOS.
     'chrome_browser_non_chromeos_sources': [
-      'browser/signin/signin_global_error.cc',
-      'browser/signin/signin_global_error.h',
-      'browser/signin/signin_global_error_factory.cc',
-      'browser/signin/signin_global_error_factory.h',
-      'browser/sync/sync_global_error_factory.cc',
-      'browser/sync/sync_global_error_factory.h',
+#      'browser/signin/signin_global_error.cc',
+#      'browser/signin/signin_global_error.h',
+#      'browser/signin/signin_global_error_factory.cc',
+#      'browser/signin/signin_global_error_factory.h',
+#      'browser/sync/sync_global_error_factory.cc',
+#      'browser/sync/sync_global_error_factory.h',
     ],
     # Everything but Android, iOS, and CrOS.
     'chrome_browser_desktop_sources': [
@@ -797,12 +797,12 @@
       'browser/first_run/upgrade_util_linux.h',
       'browser/fullscreen_aurax11.cc',
       'browser/icon_loader_auralinux.cc',
-      'browser/password_manager/native_backend_kwallet_x.cc',
-      'browser/password_manager/native_backend_kwallet_x.h',
+#      'browser/password_manager/native_backend_kwallet_x.cc',
+#      'browser/password_manager/native_backend_kwallet_x.h',
       'browser/platform_util_linux.cc',
       'browser/shell_integration_linux.cc',
       'browser/shell_integration_linux.h',
-      'browser/speech/tts_linux.cc',
+#      'browser/speech/tts_linux.cc',
       'browser/sxs_linux.cc',
       'browser/sxs_linux.h',
       'browser/themes/theme_service_aurax11.cc',
@@ -840,8 +840,8 @@
       'browser/chrome_browser_field_trials_desktop.h',
       'browser/chrome_browser_main_posix.cc',
       'browser/chrome_browser_main_posix.h',
-      'browser/chrome_device_client.cc',
-      'browser/chrome_device_client.h',
+#      'browser/chrome_device_client.cc',
+#      'browser/chrome_device_client.h',
       'browser/chrome_process_singleton.cc',
       'browser/chrome_process_singleton.h',
       'browser/component_updater/widevine_cdm_component_installer.cc',
@@ -872,19 +872,19 @@
       'browser/download/download_shelf_context_menu.h',
       'browser/external_protocol/external_protocol_observer.cc',
       'browser/external_protocol/external_protocol_observer.h',
-      'browser/feedback/feedback_profile_observer.cc',
-      'browser/feedback/feedback_profile_observer.h',
-      'browser/feedback/show_feedback_page.cc',
-      'browser/feedback/system_logs/about_system_logs_fetcher.cc',
-      'browser/feedback/system_logs/about_system_logs_fetcher.h',
-      'browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc',
-      'browser/feedback/system_logs/log_sources/chrome_internal_log_source.h',
-      'browser/feedback/system_logs/log_sources/memory_details_log_source.cc',
-      'browser/feedback/system_logs/log_sources/memory_details_log_source.h',
-      'browser/feedback/system_logs/scrubbed_system_logs_fetcher.cc',
-      'browser/feedback/system_logs/scrubbed_system_logs_fetcher.h',
-      'browser/feedback/system_logs/system_logs_fetcher_base.cc',
-      'browser/feedback/system_logs/system_logs_fetcher_base.h',
+#      'browser/feedback/feedback_profile_observer.cc',
+#      'browser/feedback/feedback_profile_observer.h',
+#      'browser/feedback/show_feedback_page.cc',
+#      'browser/feedback/system_logs/about_system_logs_fetcher.cc',
+#      'browser/feedback/system_logs/about_system_logs_fetcher.h',
+#      'browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc',
+#      'browser/feedback/system_logs/log_sources/chrome_internal_log_source.h',
+#      'browser/feedback/system_logs/log_sources/memory_details_log_source.cc',
+#      'browser/feedback/system_logs/log_sources/memory_details_log_source.h',
+#      'browser/feedback/system_logs/scrubbed_system_logs_fetcher.cc',
+#      'browser/feedback/system_logs/scrubbed_system_logs_fetcher.h',
+#      'browser/feedback/system_logs/system_logs_fetcher_base.cc',
+#      'browser/feedback/system_logs/system_logs_fetcher_base.h',
       'browser/first_run/first_run.cc',
       'browser/first_run/first_run.h',
       'browser/first_run/first_run_dialog.h',
@@ -1013,8 +1013,8 @@
       'browser/media_galleries/win/snapshot_file_details.h',
       'browser/net/firefox_proxy_settings.cc',
       'browser/net/firefox_proxy_settings.h',
-      'browser/pdf/pdf_extension_util.cc',
-      'browser/pdf/pdf_extension_util.h',
+#      'browser/pdf/pdf_extension_util.cc',
+#      'browser/pdf/pdf_extension_util.h',
       'browser/power/process_power_collector.cc',
       'browser/power/process_power_collector.h',
       'browser/process_singleton_modal_dialog_lock.cc',
@@ -1065,29 +1065,29 @@
       'browser/search/search_terms_tracker.h',
       'browser/services/gcm/gcm_desktop_utils.cc',
       'browser/services/gcm/gcm_desktop_utils.h',
-      'browser/signin/signin_promo.cc',
-      'browser/signin/signin_promo.h',
-      'browser/signin/signin_ui_util.cc',
-      'browser/signin/signin_ui_util.h',
-      'browser/speech/extension_api/tts_extension_api_constants.cc',  # Should be moved to extensions section?
-      'browser/speech/extension_api/tts_extension_api_constants.h',
+#      'browser/signin/signin_promo.cc',
+#      'browser/signin/signin_promo.h',
+#      'browser/signin/signin_ui_util.cc',
+#      'browser/signin/signin_ui_util.h',
+#      'browser/speech/extension_api/tts_extension_api_constants.cc',  # Should be moved to extensions section?
+#      'browser/speech/extension_api/tts_extension_api_constants.h',
       'browser/ssl/ssl_add_certificate.cc',
       'browser/ssl/ssl_add_certificate.h',
       'browser/ssl/ssl_client_auth_observer.cc',
       'browser/ssl/ssl_client_auth_observer.h',
       'browser/status_icons/desktop_notification_balloon.cc',
       'browser/status_icons/desktop_notification_balloon.h',
-      'browser/sync/glue/extension_backed_data_type_controller.cc',
-      'browser/sync/glue/extension_backed_data_type_controller.h',
-      'browser/sync/glue/extension_data_type_controller.cc',
-      'browser/sync/glue/extension_data_type_controller.h',
-      'browser/sync/glue/extension_setting_data_type_controller.cc',
-      'browser/sync/glue/extension_setting_data_type_controller.h',
-      'browser/sync/glue/synced_tab_delegate.cc',
-      'browser/sync/profile_sync_service_base.cc',
-      'browser/sync/profile_sync_service_base.h',
-      'browser/sync/sync_ui_util.cc',
-      'browser/sync/sync_ui_util.h',
+#      'browser/sync/glue/extension_backed_data_type_controller.cc',
+#      'browser/sync/glue/extension_backed_data_type_controller.h',
+#      'browser/sync/glue/extension_data_type_controller.cc',
+#      'browser/sync/glue/extension_data_type_controller.h',
+#      'browser/sync/glue/extension_setting_data_type_controller.cc',
+#      'browser/sync/glue/extension_setting_data_type_controller.h',
+#      'browser/sync/glue/synced_tab_delegate.cc',
+#      'browser/sync/profile_sync_service_base.cc',
+#      'browser/sync/profile_sync_service_base.h',
+#      'browser/sync/sync_ui_util.cc',
+#      'browser/sync/sync_ui_util.h',
       'browser/tracing/chrome_tracing_delegate.cc',
       'browser/tracing/chrome_tracing_delegate.h',
       'browser/tracing/crash_service_uploader.cc',
@@ -1240,18 +1240,18 @@
       'browser/browser_process_platform_part_mac.mm',
     ],
     'chrome_browser_captive_portal_sources': [
-      'browser/captive_portal/captive_portal_login_detector.cc',
-      'browser/captive_portal/captive_portal_login_detector.h',
-      'browser/captive_portal/captive_portal_service.cc',
-      'browser/captive_portal/captive_portal_service.h',
-      'browser/captive_portal/captive_portal_service_factory.cc',
-      'browser/captive_portal/captive_portal_service_factory.h',
-      'browser/captive_portal/captive_portal_tab_helper.cc',
-      'browser/captive_portal/captive_portal_tab_helper.h',
-      'browser/captive_portal/captive_portal_tab_reloader.cc',
-      'browser/captive_portal/captive_portal_tab_reloader.h',
-      'browser/ssl/captive_portal_blocking_page.cc',
-      'browser/ssl/captive_portal_blocking_page.h',
+#      'browser/captive_portal/captive_portal_login_detector.cc',
+#      'browser/captive_portal/captive_portal_login_detector.h',
+#      'browser/captive_portal/captive_portal_service.cc',
+#      'browser/captive_portal/captive_portal_service.h',
+#      'browser/captive_portal/captive_portal_service_factory.cc',
+#      'browser/captive_portal/captive_portal_service_factory.h',
+#      'browser/captive_portal/captive_portal_tab_helper.cc',
+#      'browser/captive_portal/captive_portal_tab_helper.h',
+#      'browser/captive_portal/captive_portal_tab_reloader.cc',
+#      'browser/captive_portal/captive_portal_tab_reloader.h',
+#      'browser/ssl/captive_portal_blocking_page.cc',
+#      'browser/ssl/captive_portal_blocking_page.h',
     ],
     'chrome_browser_content_settings_sources': [
       'browser/content_settings/chrome_content_settings_client.cc',
@@ -1286,24 +1286,24 @@
       'browser/autocomplete/keyword_extensions_delegate_impl.h',
       'browser/content_settings/content_settings_internal_extension_provider.cc',
       'browser/content_settings/content_settings_internal_extension_provider.h',
-      'browser/drive/drive_api_service.cc',
-      'browser/drive/drive_api_service.h',
-      'browser/drive/drive_api_util.cc',
-      'browser/drive/drive_api_util.h',
-      'browser/drive/drive_app_registry.cc',
-      'browser/drive/drive_app_registry.h',
-      'browser/drive/drive_app_registry_observer.h',
-      'browser/drive/drive_notification_manager.cc',
-      'browser/drive/drive_notification_manager.h',
-      'browser/drive/drive_notification_manager_factory.cc',
-      'browser/drive/drive_notification_manager_factory.h',
-      'browser/drive/drive_notification_observer.h',
-      'browser/drive/drive_service_interface.cc',
-      'browser/drive/drive_service_interface.h',
-      'browser/drive/drive_uploader.cc',
-      'browser/drive/drive_uploader.h',
-      'browser/drive/event_logger.cc',
-      'browser/drive/event_logger.h',
+#      'browser/drive/drive_api_service.cc',
+#      'browser/drive/drive_api_service.h',
+#      'browser/drive/drive_api_util.cc',
+#      'browser/drive/drive_api_util.h',
+#      'browser/drive/drive_app_registry.cc',
+#      'browser/drive/drive_app_registry.h',
+#      'browser/drive/drive_app_registry_observer.h',
+#      'browser/drive/drive_notification_manager.cc',
+#      'browser/drive/drive_notification_manager.h',
+#      'browser/drive/drive_notification_manager_factory.cc',
+#      'browser/drive/drive_notification_manager_factory.h',
+#      'browser/drive/drive_notification_observer.h',
+#      'browser/drive/drive_service_interface.cc',
+#      'browser/drive/drive_service_interface.h',
+#      'browser/drive/drive_uploader.cc',
+#      'browser/drive/drive_uploader.h',
+#      'browser/drive/event_logger.cc',
+#      'browser/drive/event_logger.h',
       'browser/guest_view/app_view/chrome_app_view_guest_delegate.cc',
       'browser/guest_view/app_view/chrome_app_view_guest_delegate.h',
       'browser/guest_view/extension_options/chrome_extension_options_guest_delegate.cc',
@@ -1320,8 +1320,8 @@
       'browser/guest_view/web_view/context_menu_content_type_web_view.h',
       'browser/media/cast_transport_host_filter.cc',
       'browser/media/cast_transport_host_filter.h',
-      'browser/metrics/extensions_metrics_provider.cc',
-      'browser/metrics/extensions_metrics_provider.h',
+#      'browser/metrics/extensions_metrics_provider.cc',
+#      'browser/metrics/extensions_metrics_provider.h',
       'browser/renderer_context_menu/context_menu_content_type_app_mode.cc',
       'browser/renderer_context_menu/context_menu_content_type_app_mode.h',
       'browser/renderer_context_menu/context_menu_content_type_extension_popup.cc',
@@ -1330,153 +1330,153 @@
       'browser/renderer_context_menu/context_menu_content_type_platform_app.h',
       'browser/renderer_host/chrome_extension_message_filter.cc',
       'browser/renderer_host/chrome_extension_message_filter.h',
-      'browser/search/hotword_audio_history_handler.cc',
-      'browser/search/hotword_audio_history_handler.h',
-      'browser/search/hotword_client.h',
-      'browser/search/hotword_service.cc',
-      'browser/search/hotword_service.h',
-      'browser/search/hotword_service_factory.cc',
-      'browser/search/hotword_service_factory.h',
-      'browser/signin/easy_unlock_app_manager.cc',
-      'browser/signin/easy_unlock_app_manager.h',
-      'browser/signin/easy_unlock_auth_attempt.cc',
-      'browser/signin/easy_unlock_auth_attempt.h',
-      'browser/signin/easy_unlock_metrics.cc',
-      'browser/signin/easy_unlock_metrics.h',
-      'browser/signin/easy_unlock_screenlock_state_handler.cc',
-      'browser/signin/easy_unlock_screenlock_state_handler.h',
-      'browser/signin/easy_unlock_service.cc',
-      'browser/signin/easy_unlock_service.h',
-      'browser/signin/easy_unlock_service_factory.cc',
-      'browser/signin/easy_unlock_service_factory.h',
-      'browser/signin/easy_unlock_service_regular.cc',
-      'browser/signin/easy_unlock_service_regular.h',
-      'browser/signin/easy_unlock_service_signin_chromeos.cc',
-      'browser/signin/easy_unlock_service_signin_chromeos.h',
-      'browser/speech/extension_api/tts_engine_extension_api.cc',
-      'browser/speech/extension_api/tts_engine_extension_api.h',
-      'browser/speech/extension_api/tts_engine_extension_observer.cc',
-      'browser/speech/extension_api/tts_engine_extension_observer.h',
-      'browser/speech/extension_api/tts_extension_api.cc',
-      'browser/speech/extension_api/tts_extension_api.h',
-      'browser/sync_file_system/conflict_resolution_policy.h',
-      'browser/sync_file_system/drive_backend/callback_helper.h',
-      'browser/sync_file_system/drive_backend/callback_tracker.cc',
-      'browser/sync_file_system/drive_backend/callback_tracker.h',
-      'browser/sync_file_system/drive_backend/callback_tracker_internal.cc',
-      'browser/sync_file_system/drive_backend/callback_tracker_internal.h',
-      'browser/sync_file_system/drive_backend/conflict_resolver.cc',
-      'browser/sync_file_system/drive_backend/conflict_resolver.h',
-      'browser/sync_file_system/drive_backend/drive_backend_constants.cc',
-      'browser/sync_file_system/drive_backend/drive_backend_constants.h',
-      'browser/sync_file_system/drive_backend/drive_backend_util.cc',
-      'browser/sync_file_system/drive_backend/drive_backend_util.h',
-      'browser/sync_file_system/drive_backend/drive_service_on_worker.cc',
-      'browser/sync_file_system/drive_backend/drive_service_on_worker.h',
-      'browser/sync_file_system/drive_backend/drive_service_wrapper.cc',
-      'browser/sync_file_system/drive_backend/drive_service_wrapper.h',
-      'browser/sync_file_system/drive_backend/drive_uploader_on_worker.cc',
-      'browser/sync_file_system/drive_backend/drive_uploader_on_worker.h',
-      'browser/sync_file_system/drive_backend/drive_uploader_wrapper.cc',
-      'browser/sync_file_system/drive_backend/drive_uploader_wrapper.h',
-      'browser/sync_file_system/drive_backend/folder_creator.cc',
-      'browser/sync_file_system/drive_backend/folder_creator.h',
-      'browser/sync_file_system/drive_backend/leveldb_wrapper.cc',
-      'browser/sync_file_system/drive_backend/leveldb_wrapper.h',
-      'browser/sync_file_system/drive_backend/list_changes_task.cc',
-      'browser/sync_file_system/drive_backend/list_changes_task.h',
-      'browser/sync_file_system/drive_backend/local_to_remote_syncer.cc',
-      'browser/sync_file_system/drive_backend/local_to_remote_syncer.h',
-      'browser/sync_file_system/drive_backend/metadata_database.cc',
-      'browser/sync_file_system/drive_backend/metadata_database.h',
-      'browser/sync_file_system/drive_backend/metadata_database_index.cc',
-      'browser/sync_file_system/drive_backend/metadata_database_index.h',
-      'browser/sync_file_system/drive_backend/metadata_database_index_interface.h',
-      'browser/sync_file_system/drive_backend/metadata_database_index_on_disk.cc',
-      'browser/sync_file_system/drive_backend/metadata_database_index_on_disk.h',
-      'browser/sync_file_system/drive_backend/metadata_db_migration_util.cc',
-      'browser/sync_file_system/drive_backend/metadata_db_migration_util.h',
-      'browser/sync_file_system/drive_backend/register_app_task.cc',
-      'browser/sync_file_system/drive_backend/register_app_task.h',
-      'browser/sync_file_system/drive_backend/remote_change_processor_on_worker.cc',
-      'browser/sync_file_system/drive_backend/remote_change_processor_on_worker.h',
-      'browser/sync_file_system/drive_backend/remote_change_processor_wrapper.cc',
-      'browser/sync_file_system/drive_backend/remote_change_processor_wrapper.h',
-      'browser/sync_file_system/drive_backend/remote_to_local_syncer.cc',
-      'browser/sync_file_system/drive_backend/remote_to_local_syncer.h',
-      'browser/sync_file_system/drive_backend/sync_engine.cc',
-      'browser/sync_file_system/drive_backend/sync_engine.h',
-      'browser/sync_file_system/drive_backend/sync_engine_context.cc',
-      'browser/sync_file_system/drive_backend/sync_engine_context.h',
-      'browser/sync_file_system/drive_backend/sync_engine_initializer.cc',
-      'browser/sync_file_system/drive_backend/sync_engine_initializer.h',
-      'browser/sync_file_system/drive_backend/sync_task.cc',
-      'browser/sync_file_system/drive_backend/sync_task.h',
-      'browser/sync_file_system/drive_backend/sync_task_manager.cc',
-      'browser/sync_file_system/drive_backend/sync_task_manager.h',
-      'browser/sync_file_system/drive_backend/sync_task_token.cc',
-      'browser/sync_file_system/drive_backend/sync_task_token.h',
-      'browser/sync_file_system/drive_backend/sync_worker.cc',
-      'browser/sync_file_system/drive_backend/sync_worker.h',
-      'browser/sync_file_system/drive_backend/sync_worker_interface.h',
-      'browser/sync_file_system/drive_backend/task_dependency_manager.cc',
-      'browser/sync_file_system/drive_backend/task_dependency_manager.h',
-      'browser/sync_file_system/drive_backend/tracker_id_set.cc',
-      'browser/sync_file_system/drive_backend/tracker_id_set.h',
-      'browser/sync_file_system/drive_backend/uninstall_app_task.cc',
-      'browser/sync_file_system/drive_backend/uninstall_app_task.h',
-      'browser/sync_file_system/file_change.cc',
-      'browser/sync_file_system/file_change.h',
-      'browser/sync_file_system/file_status_observer.h',
-      'browser/sync_file_system/local/local_file_change_tracker.cc',
-      'browser/sync_file_system/local/local_file_change_tracker.h',
-      'browser/sync_file_system/local/local_file_sync_context.cc',
-      'browser/sync_file_system/local/local_file_sync_context.h',
-      'browser/sync_file_system/local/local_file_sync_service.cc',
-      'browser/sync_file_system/local/local_file_sync_service.h',
-      'browser/sync_file_system/local/local_file_sync_status.cc',
-      'browser/sync_file_system/local/local_file_sync_status.h',
-      'browser/sync_file_system/local/local_origin_change_observer.h',
-      'browser/sync_file_system/local/root_delete_helper.cc',
-      'browser/sync_file_system/local/root_delete_helper.h',
-      'browser/sync_file_system/local/sync_file_system_backend.cc',
-      'browser/sync_file_system/local/sync_file_system_backend.h',
-      'browser/sync_file_system/local/syncable_file_operation_runner.cc',
-      'browser/sync_file_system/local/syncable_file_operation_runner.h',
-      'browser/sync_file_system/local/syncable_file_system_operation.cc',
-      'browser/sync_file_system/local/syncable_file_system_operation.h',
-      'browser/sync_file_system/local_change_processor.h',
-      'browser/sync_file_system/logger.cc',
-      'browser/sync_file_system/logger.h',
-      'browser/sync_file_system/remote_change_processor.h',
-      'browser/sync_file_system/remote_file_sync_service.cc',
-      'browser/sync_file_system/remote_file_sync_service.h',
-      'browser/sync_file_system/subtree_set.cc',
-      'browser/sync_file_system/subtree_set.h',
-      'browser/sync_file_system/sync_action.cc',
-      'browser/sync_file_system/sync_action.h',
-      'browser/sync_file_system/sync_callbacks.h',
-      'browser/sync_file_system/sync_direction.h',
-      'browser/sync_file_system/sync_event_observer.h',
-      'browser/sync_file_system/sync_file_metadata.cc',
-      'browser/sync_file_system/sync_file_metadata.h',
-      'browser/sync_file_system/sync_file_status.h',
-      'browser/sync_file_system/sync_file_system_service.cc',
-      'browser/sync_file_system/sync_file_system_service.h',
-      'browser/sync_file_system/sync_file_system_service_factory.cc',
-      'browser/sync_file_system/sync_file_system_service_factory.h',
-      'browser/sync_file_system/sync_file_type.h',
-      'browser/sync_file_system/sync_operation_type.cc',
-      'browser/sync_file_system/sync_operation_type.h',
-      'browser/sync_file_system/sync_process_runner.cc',
-      'browser/sync_file_system/sync_process_runner.h',
-      'browser/sync_file_system/sync_service_state.h',
-      'browser/sync_file_system/sync_status_code.cc',
-      'browser/sync_file_system/sync_status_code.h',
-      'browser/sync_file_system/syncable_file_system_util.cc',
-      'browser/sync_file_system/syncable_file_system_util.h',
-      'browser/sync_file_system/task_logger.cc',
-      'browser/sync_file_system/task_logger.h',
+#      'browser/search/hotword_audio_history_handler.cc',
+#      'browser/search/hotword_audio_history_handler.h',
+#      'browser/search/hotword_client.h',
+#      'browser/search/hotword_service.cc',
+#      'browser/search/hotword_service.h',
+#      'browser/search/hotword_service_factory.cc',
+#      'browser/search/hotword_service_factory.h',
+#      'browser/signin/easy_unlock_app_manager.cc',
+#      'browser/signin/easy_unlock_app_manager.h',
+#      'browser/signin/easy_unlock_auth_attempt.cc',
+#      'browser/signin/easy_unlock_auth_attempt.h',
+#      'browser/signin/easy_unlock_metrics.cc',
+#      'browser/signin/easy_unlock_metrics.h',
+#      'browser/signin/easy_unlock_screenlock_state_handler.cc',
+#      'browser/signin/easy_unlock_screenlock_state_handler.h',
+#      'browser/signin/easy_unlock_service.cc',
+#      'browser/signin/easy_unlock_service.h',
+#      'browser/signin/easy_unlock_service_factory.cc',
+#      'browser/signin/easy_unlock_service_factory.h',
+#      'browser/signin/easy_unlock_service_regular.cc',
+#      'browser/signin/easy_unlock_service_regular.h',
+#      'browser/signin/easy_unlock_service_signin_chromeos.cc',
+#      'browser/signin/easy_unlock_service_signin_chromeos.h',
+#      'browser/speech/extension_api/tts_engine_extension_api.cc',
+#      'browser/speech/extension_api/tts_engine_extension_api.h',
+#      'browser/speech/extension_api/tts_engine_extension_observer.cc',
+#      'browser/speech/extension_api/tts_engine_extension_observer.h',
+#      'browser/speech/extension_api/tts_extension_api.cc',
+#      'browser/speech/extension_api/tts_extension_api.h',
+#      'browser/sync_file_system/conflict_resolution_policy.h',
+#      'browser/sync_file_system/drive_backend/callback_helper.h',
+#      'browser/sync_file_system/drive_backend/callback_tracker.cc',
+#      'browser/sync_file_system/drive_backend/callback_tracker.h',
+#      'browser/sync_file_system/drive_backend/callback_tracker_internal.cc',
+#      'browser/sync_file_system/drive_backend/callback_tracker_internal.h',
+#      'browser/sync_file_system/drive_backend/conflict_resolver.cc',
+#      'browser/sync_file_system/drive_backend/conflict_resolver.h',
+#      'browser/sync_file_system/drive_backend/drive_backend_constants.cc',
+#      'browser/sync_file_system/drive_backend/drive_backend_constants.h',
+#      'browser/sync_file_system/drive_backend/drive_backend_util.cc',
+#      'browser/sync_file_system/drive_backend/drive_backend_util.h',
+#      'browser/sync_file_system/drive_backend/drive_service_on_worker.cc',
+#      'browser/sync_file_system/drive_backend/drive_service_on_worker.h',
+#      'browser/sync_file_system/drive_backend/drive_service_wrapper.cc',
+#      'browser/sync_file_system/drive_backend/drive_service_wrapper.h',
+#      'browser/sync_file_system/drive_backend/drive_uploader_on_worker.cc',
+#      'browser/sync_file_system/drive_backend/drive_uploader_on_worker.h',
+#      'browser/sync_file_system/drive_backend/drive_uploader_wrapper.cc',
+#      'browser/sync_file_system/drive_backend/drive_uploader_wrapper.h',
+#      'browser/sync_file_system/drive_backend/folder_creator.cc',
+#      'browser/sync_file_system/drive_backend/folder_creator.h',
+#      'browser/sync_file_system/drive_backend/leveldb_wrapper.cc',
+#      'browser/sync_file_system/drive_backend/leveldb_wrapper.h',
+#      'browser/sync_file_system/drive_backend/list_changes_task.cc',
+#      'browser/sync_file_system/drive_backend/list_changes_task.h',
+#      'browser/sync_file_system/drive_backend/local_to_remote_syncer.cc',
+#      'browser/sync_file_system/drive_backend/local_to_remote_syncer.h',
+#      'browser/sync_file_system/drive_backend/metadata_database.cc',
+#      'browser/sync_file_system/drive_backend/metadata_database.h',
+#      'browser/sync_file_system/drive_backend/metadata_database_index.cc',
+#      'browser/sync_file_system/drive_backend/metadata_database_index.h',
+#      'browser/sync_file_system/drive_backend/metadata_database_index_interface.h',
+#      'browser/sync_file_system/drive_backend/metadata_database_index_on_disk.cc',
+#      'browser/sync_file_system/drive_backend/metadata_database_index_on_disk.h',
+#      'browser/sync_file_system/drive_backend/metadata_db_migration_util.cc',
+#      'browser/sync_file_system/drive_backend/metadata_db_migration_util.h',
+#      'browser/sync_file_system/drive_backend/register_app_task.cc',
+#      'browser/sync_file_system/drive_backend/register_app_task.h',
+#      'browser/sync_file_system/drive_backend/remote_change_processor_on_worker.cc',
+#      'browser/sync_file_system/drive_backend/remote_change_processor_on_worker.h',
+#      'browser/sync_file_system/drive_backend/remote_change_processor_wrapper.cc',
+#      'browser/sync_file_system/drive_backend/remote_change_processor_wrapper.h',
+#      'browser/sync_file_system/drive_backend/remote_to_local_syncer.cc',
+#      'browser/sync_file_system/drive_backend/remote_to_local_syncer.h',
+#      'browser/sync_file_system/drive_backend/sync_engine.cc',
+#      'browser/sync_file_system/drive_backend/sync_engine.h',
+#      'browser/sync_file_system/drive_backend/sync_engine_context.cc',
+#      'browser/sync_file_system/drive_backend/sync_engine_context.h',
+#      'browser/sync_file_system/drive_backend/sync_engine_initializer.cc',
+#      'browser/sync_file_system/drive_backend/sync_engine_initializer.h',
+#      'browser/sync_file_system/drive_backend/sync_task.cc',
+#      'browser/sync_file_system/drive_backend/sync_task.h',
+#      'browser/sync_file_system/drive_backend/sync_task_manager.cc',
+#      'browser/sync_file_system/drive_backend/sync_task_manager.h',
+#      'browser/sync_file_system/drive_backend/sync_task_token.cc',
+#      'browser/sync_file_system/drive_backend/sync_task_token.h',
+#      'browser/sync_file_system/drive_backend/sync_worker.cc',
+#      'browser/sync_file_system/drive_backend/sync_worker.h',
+#      'browser/sync_file_system/drive_backend/sync_worker_interface.h',
+#      'browser/sync_file_system/drive_backend/task_dependency_manager.cc',
+#      'browser/sync_file_system/drive_backend/task_dependency_manager.h',
+#      'browser/sync_file_system/drive_backend/tracker_id_set.cc',
+#      'browser/sync_file_system/drive_backend/tracker_id_set.h',
+#      'browser/sync_file_system/drive_backend/uninstall_app_task.cc',
+#      'browser/sync_file_system/drive_backend/uninstall_app_task.h',
+#      'browser/sync_file_system/file_change.cc',
+#      'browser/sync_file_system/file_change.h',
+#      'browser/sync_file_system/file_status_observer.h',
+#      'browser/sync_file_system/local/local_file_change_tracker.cc',
+#      'browser/sync_file_system/local/local_file_change_tracker.h',
+#      'browser/sync_file_system/local/local_file_sync_context.cc',
+#      'browser/sync_file_system/local/local_file_sync_context.h',
+#      'browser/sync_file_system/local/local_file_sync_service.cc',
+#      'browser/sync_file_system/local/local_file_sync_service.h',
+#      'browser/sync_file_system/local/local_file_sync_status.cc',
+#      'browser/sync_file_system/local/local_file_sync_status.h',
+#      'browser/sync_file_system/local/local_origin_change_observer.h',
+#      'browser/sync_file_system/local/root_delete_helper.cc',
+#      'browser/sync_file_system/local/root_delete_helper.h',
+#      'browser/sync_file_system/local/sync_file_system_backend.cc',
+#      'browser/sync_file_system/local/sync_file_system_backend.h',
+#      'browser/sync_file_system/local/syncable_file_operation_runner.cc',
+#      'browser/sync_file_system/local/syncable_file_operation_runner.h',
+#      'browser/sync_file_system/local/syncable_file_system_operation.cc',
+#      'browser/sync_file_system/local/syncable_file_system_operation.h',
+#      'browser/sync_file_system/local_change_processor.h',
+#      'browser/sync_file_system/logger.cc',
+#      'browser/sync_file_system/logger.h',
+#      'browser/sync_file_system/remote_change_processor.h',
+#      'browser/sync_file_system/remote_file_sync_service.cc',
+#      'browser/sync_file_system/remote_file_sync_service.h',
+#      'browser/sync_file_system/subtree_set.cc',
+#      'browser/sync_file_system/subtree_set.h',
+#      'browser/sync_file_system/sync_action.cc',
+#      'browser/sync_file_system/sync_action.h',
+#      'browser/sync_file_system/sync_callbacks.h',
+#      'browser/sync_file_system/sync_direction.h',
+#      'browser/sync_file_system/sync_event_observer.h',
+#      'browser/sync_file_system/sync_file_metadata.cc',
+#      'browser/sync_file_system/sync_file_metadata.h',
+#      'browser/sync_file_system/sync_file_status.h',
+#      'browser/sync_file_system/sync_file_system_service.cc',
+#      'browser/sync_file_system/sync_file_system_service.h',
+#      'browser/sync_file_system/sync_file_system_service_factory.cc',
+#      'browser/sync_file_system/sync_file_system_service_factory.h',
+#      'browser/sync_file_system/sync_file_type.h',
+#      'browser/sync_file_system/sync_operation_type.cc',
+#      'browser/sync_file_system/sync_operation_type.h',
+#      'browser/sync_file_system/sync_process_runner.cc',
+#      'browser/sync_file_system/sync_process_runner.h',
+#      'browser/sync_file_system/sync_service_state.h',
+#      'browser/sync_file_system/sync_status_code.cc',
+#      'browser/sync_file_system/sync_status_code.h',
+#      'browser/sync_file_system/syncable_file_system_util.cc',
+#      'browser/sync_file_system/syncable_file_system_util.h',
+#      'browser/sync_file_system/task_logger.cc',
+#      'browser/sync_file_system/task_logger.h',
     ],
     'chrome_browser_favicon_sources': [
       'browser/favicon/chrome_favicon_client.cc',
@@ -1494,29 +1494,29 @@
       'browser/favicon/favicon_tab_helper_observer.h',
     ],
     'chrome_browser_gnome_keyring_sources': [
-      'browser/password_manager/native_backend_gnome_x.cc',
-      'browser/password_manager/native_backend_gnome_x.h',
+#      'browser/password_manager/native_backend_gnome_x.cc',
+#      'browser/password_manager/native_backend_gnome_x.h',
     ],
     'chrome_browser_libsecret_sources': [
-       'browser/password_manager/native_backend_libsecret.cc',
-       'browser/password_manager/native_backend_libsecret.h',
+#       'browser/password_manager/native_backend_libsecret.cc',
+#       'browser/password_manager/native_backend_libsecret.h',
     ],
     'chrome_browser_google_sources': [
-      'browser/google/chrome_google_url_tracker_client.cc',
-      'browser/google/chrome_google_url_tracker_client.h',
-      'browser/google/google_brand.cc',
-      'browser/google/google_brand.h',
-      'browser/google/google_brand_chromeos.cc',
-      'browser/google/google_brand_chromeos.h',
-      'browser/google/google_search_counter.cc',
-      'browser/google/google_search_counter.h',
-      'browser/google/google_search_counter_android.cc',
-      'browser/google/google_search_counter_android.h',
-      'browser/google/google_update_settings_posix.cc',
-      'browser/google/google_update_win.cc',
-      'browser/google/google_update_win.h',
-      'browser/google/google_url_tracker_factory.cc',
-      'browser/google/google_url_tracker_factory.h',
+#      'browser/google/chrome_google_url_tracker_client.cc',
+#      'browser/google/chrome_google_url_tracker_client.h',
+#      'browser/google/google_brand.cc',
+#      'browser/google/google_brand.h',
+#      'browser/google/google_brand_chromeos.cc',
+#      'browser/google/google_brand_chromeos.h',
+#      'browser/google/google_search_counter.cc',
+#      'browser/google/google_search_counter.h',
+#      'browser/google/google_search_counter_android.cc',
+#      'browser/google/google_search_counter_android.h',
+#      'browser/google/google_update_settings_posix.cc',
+#      'browser/google/google_update_win.cc',
+#      'browser/google/google_update_win.h',
+#      'browser/google/google_url_tracker_factory.cc',
+#      'browser/google/google_url_tracker_factory.h',
     ],
     'chrome_browser_history_sources': [
       'browser/history/android/android_history_provider_service.cc',
@@ -1653,71 +1653,71 @@
       'android/java/src/org/chromium/chrome/browser/toolbar/ToolbarModel.java'
     ],
     'chrome_browser_mdns_sources': [
-      'browser/local_discovery/privet_traffic_detector.cc',
-      'browser/local_discovery/privet_traffic_detector.h',
-      'browser/local_discovery/service_discovery_client_mdns.cc',
-      'browser/local_discovery/service_discovery_client_mdns.h',
-      'browser/local_discovery/service_discovery_client_utility.cc',
-      'browser/local_discovery/service_discovery_client_utility.h',
-      'browser/local_discovery/service_discovery_host_client.cc',
-      'browser/local_discovery/service_discovery_host_client.h',
+#      'browser/local_discovery/privet_traffic_detector.cc',
+#      'browser/local_discovery/privet_traffic_detector.h',
+#      'browser/local_discovery/service_discovery_client_mdns.cc',
+#      'browser/local_discovery/service_discovery_client_mdns.h',
+#      'browser/local_discovery/service_discovery_client_utility.cc',
+#      'browser/local_discovery/service_discovery_client_utility.h',
+#      'browser/local_discovery/service_discovery_host_client.cc',
+#      'browser/local_discovery/service_discovery_host_client.h',
     ],
     'chrome_browser_metrics_sources': [
-      'browser/metrics/chrome_browser_main_extra_parts_metrics.cc',
-      'browser/metrics/chrome_browser_main_extra_parts_metrics.h',
-      'browser/metrics/chrome_browser_main_extra_parts_metrics_mac.mm',
-      'browser/metrics/chrome_metrics_service_accessor.cc',
-      'browser/metrics/chrome_metrics_service_accessor.h',
-      'browser/metrics/chrome_metrics_service_client.cc',
-      'browser/metrics/chrome_metrics_service_client.h',
-      'browser/metrics/chrome_stability_metrics_provider.cc',
-      'browser/metrics/chrome_stability_metrics_provider.h',
-      'browser/metrics/field_trial_synchronizer.cc',
-      'browser/metrics/field_trial_synchronizer.h',
-      'browser/metrics/first_web_contents_profiler.cc',
-      'browser/metrics/first_web_contents_profiler.h',
-      'browser/metrics/google_update_metrics_provider_win.cc',
-      'browser/metrics/google_update_metrics_provider_win.h',
-      'browser/metrics/jumplist_metrics_win.cc',
-      'browser/metrics/jumplist_metrics_win.h',
-      'browser/metrics/metrics_memory_details.cc',
-      'browser/metrics/metrics_memory_details.h',
-      'browser/metrics/metrics_reporting_state.cc',
-      'browser/metrics/metrics_reporting_state.h',
-      'browser/metrics/metrics_services_manager.cc',
-      'browser/metrics/metrics_services_manager.h',
-      'browser/metrics/network_stats_uploader.cc',
-      'browser/metrics/network_stats_uploader.h',
-      'browser/metrics/omnibox_metrics_provider.cc',
-      'browser/metrics/omnibox_metrics_provider.h',
-      'browser/metrics/perf_provider_chromeos.cc',
-      'browser/metrics/perf_provider_chromeos.h',
-      'browser/metrics/rappor/sampling.cc',
-      'browser/metrics/rappor/sampling.h',
-      'browser/metrics/signin_status_metrics_provider.cc',
-      'browser/metrics/signin_status_metrics_provider.h',
-      'browser/metrics/signin_status_metrics_provider_base.cc',
-      'browser/metrics/signin_status_metrics_provider_base.h',
-      'browser/metrics/signin_status_metrics_provider_chromeos.cc',
-      'browser/metrics/signin_status_metrics_provider_chromeos.h',
-      'browser/metrics/thread_watcher.cc',
-      'browser/metrics/thread_watcher.h',
-      'browser/metrics/thread_watcher_android.cc',
-      'browser/metrics/thread_watcher_android.h',
-      'browser/metrics/thread_watcher_report_hang.cc',
-      'browser/metrics/thread_watcher_report_hang.h',
-      'browser/metrics/time_ticks_experiment_win.cc',
-      'browser/metrics/time_ticks_experiment_win.h',
-      'browser/metrics/variations/generated_resources_map.h',
-      'browser/metrics/variations/generated_resources_map_lookup.cc',
-      'browser/metrics/variations/variations_registry_syncer_win.cc',
-      'browser/metrics/variations/variations_registry_syncer_win.h',
-      'browser/metrics/variations/variations_request_scheduler.cc',
-      'browser/metrics/variations/variations_request_scheduler.h',
-      'browser/metrics/variations/variations_seed_store.cc',
-      'browser/metrics/variations/variations_seed_store.h',
-      'browser/metrics/variations/variations_service.cc',
-      'browser/metrics/variations/variations_service.h',
+#      'browser/metrics/chrome_browser_main_extra_parts_metrics.cc',
+#      'browser/metrics/chrome_browser_main_extra_parts_metrics.h',
+#      'browser/metrics/chrome_browser_main_extra_parts_metrics_mac.mm',
+#      'browser/metrics/chrome_metrics_service_accessor.cc',
+#      'browser/metrics/chrome_metrics_service_accessor.h',
+#      'browser/metrics/chrome_metrics_service_client.cc',
+#      'browser/metrics/chrome_metrics_service_client.h',
+#      'browser/metrics/chrome_stability_metrics_provider.cc',
+#      'browser/metrics/chrome_stability_metrics_provider.h',
+#      'browser/metrics/field_trial_synchronizer.cc',
+#      'browser/metrics/field_trial_synchronizer.h',
+#      'browser/metrics/first_web_contents_profiler.cc',
+#      'browser/metrics/first_web_contents_profiler.h',
+#      'browser/metrics/google_update_metrics_provider_win.cc',
+#      'browser/metrics/google_update_metrics_provider_win.h',
+#      'browser/metrics/jumplist_metrics_win.cc',
+#      'browser/metrics/jumplist_metrics_win.h',
+#      'browser/metrics/metrics_memory_details.cc',
+#      'browser/metrics/metrics_memory_details.h',
+#      'browser/metrics/metrics_reporting_state.cc',
+#      'browser/metrics/metrics_reporting_state.h',
+#      'browser/metrics/metrics_services_manager.cc',
+#      'browser/metrics/metrics_services_manager.h',
+#      'browser/metrics/network_stats_uploader.cc',
+#      'browser/metrics/network_stats_uploader.h',
+#      'browser/metrics/omnibox_metrics_provider.cc',
+#      'browser/metrics/omnibox_metrics_provider.h',
+#      'browser/metrics/perf_provider_chromeos.cc',
+#      'browser/metrics/perf_provider_chromeos.h',
+#      'browser/metrics/rappor/sampling.cc',
+#      'browser/metrics/rappor/sampling.h',
+#      'browser/metrics/signin_status_metrics_provider.cc',
+#      'browser/metrics/signin_status_metrics_provider.h',
+#      'browser/metrics/signin_status_metrics_provider_base.cc',
+#      'browser/metrics/signin_status_metrics_provider_base.h',
+#      'browser/metrics/signin_status_metrics_provider_chromeos.cc',
+#      'browser/metrics/signin_status_metrics_provider_chromeos.h',
+#      'browser/metrics/thread_watcher.cc',
+#      'browser/metrics/thread_watcher.h',
+#      'browser/metrics/thread_watcher_android.cc',
+#      'browser/metrics/thread_watcher_android.h',
+#      'browser/metrics/thread_watcher_report_hang.cc',
+#      'browser/metrics/thread_watcher_report_hang.h',
+#      'browser/metrics/time_ticks_experiment_win.cc',
+#      'browser/metrics/time_ticks_experiment_win.h',
+#      'browser/metrics/variations/generated_resources_map.h',
+#      'browser/metrics/variations/generated_resources_map_lookup.cc',
+#      'browser/metrics/variations/variations_registry_syncer_win.cc',
+#      'browser/metrics/variations/variations_registry_syncer_win.h',
+#      'browser/metrics/variations/variations_request_scheduler.cc',
+#      'browser/metrics/variations/variations_request_scheduler.h',
+#      'browser/metrics/variations/variations_seed_store.cc',
+#      'browser/metrics/variations/variations_seed_store.h',
+#      'browser/metrics/variations/variations_service.cc',
+#      'browser/metrics/variations/variations_service.h',
     ],
     'chrome_browser_nacl_sources': [
       'browser/component_updater/pnacl/pnacl_component_installer.cc',
@@ -1902,8 +1902,8 @@
     'chrome_browser_plugins_sources': [
       'browser/browsing_data/browsing_data_flash_lso_helper.cc',
       'browser/browsing_data/browsing_data_flash_lso_helper.h',
-      'browser/component_updater/flash_component_installer.h',
-      'browser/component_updater/pepper_flash_component_installer.cc',
+#      'browser/component_updater/flash_component_installer.h',
+#      'browser/component_updater/pepper_flash_component_installer.cc',
       'browser/metrics/plugin_metrics_provider.cc',
       'browser/metrics/plugin_metrics_provider.h',
       'browser/pepper_broker_infobar_delegate.cc',
@@ -2024,8 +2024,8 @@
       'browser/policy/network_prediction_policy_handler.h',
       'browser/sessions/restore_on_startup_policy_handler.cc',
       'browser/sessions/restore_on_startup_policy_handler.h',
-      'browser/sync/sync_policy_handler.cc',
-      'browser/sync/sync_policy_handler.h',
+#      'browser/sync/sync_policy_handler.cc',
+#      'browser/sync/sync_policy_handler.h',
     ],
     # Policy sources used only on Android and iOS (CrOS not counted).
     'chrome_browser_policy_mobile_sources': [
@@ -2036,8 +2036,8 @@
     'chrome_browser_policy_desktop_sources': [
       'browser/policy/cloud/user_policy_signin_service.cc',
       'browser/policy/cloud/user_policy_signin_service.h',
-      'browser/sync/sync_global_error.cc',
-      'browser/sync/sync_global_error.h',
+#      'browser/sync/sync_global_error.cc',
+#      'browser/sync/sync_global_error.h',
       'browser/upgrade_detector_impl.cc',
       'browser/upgrade_detector_impl.h',
     ],
@@ -2780,8 +2780,8 @@
       'browser/sync/sync_type_preference_provider.h',
     ],
     'chrome_browser_task_manager_sources': [
-      'browser/task_manager/background_information.cc',
-      'browser/task_manager/background_information.h',
+#      'browser/task_manager/background_information.cc',
+#      'browser/task_manager/background_information.h',
       'browser/task_manager/browser_process_resource_provider.cc',
       'browser/task_manager/browser_process_resource_provider.h',
       'browser/task_manager/child_process_resource_provider.cc',
@@ -2900,7 +2900,7 @@
         '../components/components.gyp:enhanced_bookmarks',
         '../components/components.gyp:favicon_base',
         '../components/components.gyp:favicon_core',
-        '../components/components.gyp:feedback_component',
+#        '../components/components.gyp:feedback_component',
         '../components/components.gyp:gcm_driver',
         '../components/components.gyp:google_core_browser',
         '../components/components.gyp:handoff',
@@ -3038,7 +3038,7 @@
             '../third_party/mojo/mojo_public.gyp:mojo_js_bindings',
             '../third_party/npapi/npapi.gyp:npapi',
             '../third_party/smhasher/smhasher.gyp:cityhash',
-            '../third_party/webrtc/modules/modules.gyp:desktop_capture',
+#            '../third_party/webrtc/modules/modules.gyp:desktop_capture',
             '../ui/base/ime/ui_base_ime.gyp:ui_base_ime',
             '../ui/gl/gl.gyp:gl',
             '../ui/surface/surface.gyp:surface',
@@ -3285,6 +3285,24 @@
           'defines': [
             'USE_LIBSECRET',
           ],
+          'cflags': [
+            '<!@(pkg-config --cflags libsecret-1)',
+          ],
+          'cflags': [
+            '<!@(pkg-config --cflags libsecret-1)',
+          ],
+          'cflags': [
+            '<!@(pkg-config --cflags libsecret-1)',
+          ],
+          'cflags': [
+            '<!@(pkg-config --cflags libsecret-1)',
+          ],
+          'cflags': [
+            '<!@(pkg-config --cflags libsecret-1)',
+          ],
+          'cflags': [
+            '<!@(pkg-config --cflags libsecret-1)',
+          ],
         }],
         ['use_aura==1', {
           'sources': [ '<@(chrome_browser_aura_sources)' ],
@@ -3388,7 +3406,7 @@
             'chrome_browser_jni_headers',
           ],
           'dependencies!': [
-            '../components/components.gyp:feedback_component',
+#            '../components/components.gyp:feedback_component',
             '../components/components.gyp:storage_monitor',
             '../components/components.gyp:web_modal',
             '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput',
diff --git a/chrome/chrome_browser_extensions.gypi b/chrome/chrome_browser_extensions.gypi
index e8b7998..faa5e48 100644
--- a/chrome/chrome_browser_extensions.gypi
+++ b/chrome/chrome_browser_extensions.gypi
@@ -37,10 +37,10 @@
       'browser/extensions/updater/local_extension_cache.h',
     ],
     'chrome_browser_extensions_non_chromeos_sources': [
-      'browser/extensions/api/easy_unlock_private/easy_unlock_private_crypto_delegate_stub.cc',
-      'browser/extensions/api/feedback_private/feedback_service_nonchromeos.cc',
-      'browser/extensions/api/image_writer_private/operation_nonchromeos.cc',
-      'browser/extensions/api/image_writer_private/removable_storage_provider_linux.cc',
+#      'browser/extensions/api/easy_unlock_private/easy_unlock_private_crypto_delegate_stub.cc',
+#      'browser/extensions/api/feedback_private/feedback_service_nonchromeos.cc',
+#      'browser/extensions/api/image_writer_private/operation_nonchromeos.cc',
+#      'browser/extensions/api/image_writer_private/removable_storage_provider_linux.cc',
       'browser/extensions/api/messaging/native_message_process_host.cc',
       'browser/extensions/api/messaging/native_message_process_host.h',
       'browser/extensions/api/messaging/native_process_launcher.cc',
@@ -127,12 +127,12 @@
       'browser/extensions/api/bookmarks/bookmark_api_helpers.h',
       'browser/extensions/api/bookmarks/bookmarks_api.cc',
       'browser/extensions/api/bookmarks/bookmarks_api.h',
-      'browser/extensions/api/braille_display_private/braille_controller.h',
-      'browser/extensions/api/braille_display_private/braille_controller_brlapi.h',
-      'browser/extensions/api/braille_display_private/braille_display_private_api.cc',
-      'browser/extensions/api/braille_display_private/braille_display_private_api.h',
-      'browser/extensions/api/braille_display_private/stub_braille_controller.cc',
-      'browser/extensions/api/braille_display_private/stub_braille_controller.h',
+#      'browser/extensions/api/braille_display_private/braille_controller.h',
+#      'browser/extensions/api/braille_display_private/braille_controller_brlapi.h',
+#      'browser/extensions/api/braille_display_private/braille_display_private_api.cc',
+#      'browser/extensions/api/braille_display_private/braille_display_private_api.h',
+#      'browser/extensions/api/braille_display_private/stub_braille_controller.cc',
+#      'browser/extensions/api/braille_display_private/stub_braille_controller.h',
       'browser/extensions/api/browser/browser_api.cc',
       'browser/extensions/api/browser/browser_api.h',
       'browser/extensions/api/browsing_data/browsing_data_api.cc',
@@ -140,8 +140,8 @@
       'browser/extensions/api/chrome_device_permissions_prompt.h',
       'browser/extensions/api/chrome_extensions_api_client.cc',
       'browser/extensions/api/chrome_extensions_api_client.h',
-      'browser/extensions/api/cloud_print_private/cloud_print_private_api.cc',
-      'browser/extensions/api/cloud_print_private/cloud_print_private_api.h',
+#      'browser/extensions/api/cloud_print_private/cloud_print_private_api.cc',
+#      'browser/extensions/api/cloud_print_private/cloud_print_private_api.h',
       'browser/extensions/api/command_line_private/command_line_private_api.cc',
       'browser/extensions/api/command_line_private/command_line_private_api.h',
       'browser/extensions/api/commands/command_service.cc',
@@ -190,30 +190,30 @@
       'browser/extensions/api/declarative_content/content_condition.h',
       'browser/extensions/api/declarative_content/content_constants.cc',
       'browser/extensions/api/declarative_content/content_constants.h',
-      'browser/extensions/api/desktop_capture/desktop_capture_api.cc',
-      'browser/extensions/api/desktop_capture/desktop_capture_api.h',
+#      'browser/extensions/api/desktop_capture/desktop_capture_api.cc',
+#      'browser/extensions/api/desktop_capture/desktop_capture_api.h',
       'browser/extensions/api/developer_private/developer_private_api.cc',
       'browser/extensions/api/developer_private/developer_private_api.h',
       'browser/extensions/api/developer_private/entry_picker.cc',
       'browser/extensions/api/developer_private/entry_picker.h',
-      'browser/extensions/api/dial/dial_api.cc',
-      'browser/extensions/api/dial/dial_api.h',
-      'browser/extensions/api/dial/dial_api_factory.cc',
-      'browser/extensions/api/dial/dial_api_factory.h',
-      'browser/extensions/api/dial/dial_device_data.cc',
-      'browser/extensions/api/dial/dial_device_data.h',
-      'browser/extensions/api/dial/dial_registry.cc',
-      'browser/extensions/api/dial/dial_registry.h',
-      'browser/extensions/api/dial/dial_service.cc',
-      'browser/extensions/api/dial/dial_service.h',
+#      'browser/extensions/api/dial/dial_api.cc',
+#      'browser/extensions/api/dial/dial_api.h',
+#      'browser/extensions/api/dial/dial_api_factory.cc',
+#      'browser/extensions/api/dial/dial_api_factory.h',
+#      'browser/extensions/api/dial/dial_device_data.cc',
+#      'browser/extensions/api/dial/dial_device_data.h',
+#      'browser/extensions/api/dial/dial_registry.cc',
+#      'browser/extensions/api/dial/dial_registry.h',
+#      'browser/extensions/api/dial/dial_service.cc',
+#      'browser/extensions/api/dial/dial_service.h',
       'browser/extensions/api/downloads/downloads_api.cc',
       'browser/extensions/api/downloads/downloads_api.h',
       'browser/extensions/api/downloads_internal/downloads_internal_api.cc',
       'browser/extensions/api/downloads_internal/downloads_internal_api.h',
-      'browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc',
-      'browser/extensions/api/easy_unlock_private/easy_unlock_private_api.h',
-      'browser/extensions/api/easy_unlock_private/easy_unlock_private_crypto_delegate.h',
-      'browser/extensions/api/easy_unlock_private/easy_unlock_private_crypto_delegate_chromeos.cc',
+#      'browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc',
+#      'browser/extensions/api/easy_unlock_private/easy_unlock_private_api.h',
+#      'browser/extensions/api/easy_unlock_private/easy_unlock_private_crypto_delegate.h',
+#      'browser/extensions/api/easy_unlock_private/easy_unlock_private_crypto_delegate_chromeos.cc',
       'browser/extensions/api/experience_sampling_private/experience_sampling.cc',
       'browser/extensions/api/experience_sampling_private/experience_sampling.h',
       'browser/extensions/api/experience_sampling_private/experience_sampling_private_api.cc',
@@ -222,11 +222,11 @@
       'browser/extensions/api/extension_action/extension_action_api.h',
       'browser/extensions/api/extension_action/extension_page_actions_api_constants.cc',
       'browser/extensions/api/extension_action/extension_page_actions_api_constants.h',
-      'browser/extensions/api/feedback_private/feedback_private_api.cc',
-      'browser/extensions/api/feedback_private/feedback_private_api.h',
-      'browser/extensions/api/feedback_private/feedback_service.cc',
-      'browser/extensions/api/feedback_private/feedback_service.h',
-      'browser/extensions/api/feedback_private/feedback_service_chromeos.cc',
+#      'browser/extensions/api/feedback_private/feedback_private_api.cc',
+#      'browser/extensions/api/feedback_private/feedback_private_api.h',
+#      'browser/extensions/api/feedback_private/feedback_service.cc',
+#      'browser/extensions/api/feedback_private/feedback_service.h',
+#      'browser/extensions/api/feedback_private/feedback_service_chromeos.cc',
       'browser/extensions/api/file_handlers/app_file_handler_util.cc',
       'browser/extensions/api/file_handlers/app_file_handler_util.h',
       'browser/extensions/api/file_handlers/mime_util.cc',
@@ -235,14 +235,14 @@
       'browser/extensions/api/file_system/file_system_api.h',
       'browser/extensions/api/font_settings/font_settings_api.cc',
       'browser/extensions/api/font_settings/font_settings_api.h',
-      'browser/extensions/api/gcd_private/gcd_private_api.cc',
-      'browser/extensions/api/gcd_private/gcd_private_api.h',
+#      'browser/extensions/api/gcd_private/gcd_private_api.cc',
+#      'browser/extensions/api/gcd_private/gcd_private_api.h',
       'browser/extensions/api/gcm/gcm_api.cc',
       'browser/extensions/api/gcm/gcm_api.h',
       'browser/extensions/api/history/history_api.cc',
       'browser/extensions/api/history/history_api.h',
-      'browser/extensions/api/hotword_private/hotword_private_api.cc',
-      'browser/extensions/api/hotword_private/hotword_private_api.h',
+#      'browser/extensions/api/hotword_private/hotword_private_api.cc',
+#      'browser/extensions/api/hotword_private/hotword_private_api.h',
       'browser/extensions/api/i18n/i18n_api.cc',
       'browser/extensions/api/i18n/i18n_api.h',
       'browser/extensions/api/identity/extension_token_key.cc',
@@ -261,46 +261,47 @@
       'browser/extensions/api/identity_private/identity_private_api.h',
       'browser/extensions/api/idltest/idltest_api.cc',
       'browser/extensions/api/idltest/idltest_api.h',
-      'browser/extensions/api/image_writer_private/destroy_partitions_operation.cc',
-      'browser/extensions/api/image_writer_private/destroy_partitions_operation.h',
-      'browser/extensions/api/image_writer_private/error_messages.cc',
-      'browser/extensions/api/image_writer_private/error_messages.h',
-      'browser/extensions/api/image_writer_private/image_writer_private_api.cc',
-      'browser/extensions/api/image_writer_private/image_writer_private_api.h',
-      'browser/extensions/api/image_writer_private/image_writer_utility_client.cc',
-      'browser/extensions/api/image_writer_private/image_writer_utility_client.h',
-      'browser/extensions/api/image_writer_private/operation.cc',
-      'browser/extensions/api/image_writer_private/operation.h',
-      'browser/extensions/api/image_writer_private/operation_chromeos.cc',
-      'browser/extensions/api/image_writer_private/operation_manager.cc',
-      'browser/extensions/api/image_writer_private/operation_manager.h',
-      'browser/extensions/api/image_writer_private/removable_storage_provider.cc',
-      'browser/extensions/api/image_writer_private/removable_storage_provider.h',
-      'browser/extensions/api/image_writer_private/removable_storage_provider_chromeos.cc',
-      'browser/extensions/api/image_writer_private/removable_storage_provider_mac.cc',
-      'browser/extensions/api/image_writer_private/removable_storage_provider_win.cc',
-      'browser/extensions/api/image_writer_private/write_from_file_operation.cc',
-      'browser/extensions/api/image_writer_private/write_from_file_operation.h',
-      'browser/extensions/api/image_writer_private/write_from_url_operation.cc',
-      'browser/extensions/api/image_writer_private/write_from_url_operation.h',
-      'browser/extensions/api/inline_install_private/inline_install_private_api.cc',
-      'browser/extensions/api/inline_install_private/inline_install_private_api.h',
+#      'browser/extensions/api/image_writer_private/destroy_partitions_operation.cc',
+#      'browser/extensions/api/image_writer_private/destroy_partitions_operation.h',
+#      'browser/extensions/api/image_writer_private/error_messages.cc',
+#      'browser/extensions/api/image_writer_private/error_messages.h',
+#      'browser/extensions/api/image_writer_private/image_writer_private_api.cc',
+#      'browser/extensions/api/image_writer_private/image_writer_private_api.h',
+#      'browser/extensions/api/image_writer_private/image_writer_utility_client.cc',
+#      'browser/extensions/api/image_writer_private/image_writer_utility_client.h',
+#      'browser/extensions/api/image_writer_private/operation.cc',
+#      'browser/extensions/api/image_writer_private/operation.h',
+#      'browser/extensions/api/image_writer_private/operation_chromeos.cc',
+#      'browser/extensions/api/image_writer_private/operation_manager.cc',
+#      'browser/extensions/api/image_writer_private/operation_manager.h',
+#      'browser/extensions/api/image_writer_private/removable_storage_provider.cc',
+#      'browser/extensions/api/image_writer_private/removable_storage_provider.h',
+#      'browser/extensions/api/image_writer_private/removable_storage_provider_chromeos.cc',
+#      'browser/extensions/api/image_writer_private/removable_storage_provider_mac.cc',
+#      'browser/extensions/api/image_writer_private/removable_storage_provider_win.cc',
+#      'browser/extensions/api/image_writer_private/write_from_file_operation.cc',
+#      'browser/extensions/api/image_writer_private/write_from_file_operation.h',
+#      'browser/extensions/api/image_writer_private/write_from_url_operation.cc',
+#      'browser/extensions/api/image_writer_private/write_from_url_operation.h',
+#      'browser/extensions/api/inline_install_private/inline_install_private_api.cc',
+#      'browser/extensions/api/inline_install_private/inline_install_private_api.h',
+#TODO: launcher_page.idl  see if this is really needed!
       'browser/extensions/api/launcher_page/launcher_page_api.cc',
       'browser/extensions/api/launcher_page/launcher_page_api.h',
-      'browser/extensions/api/location/location_api.cc',
-      'browser/extensions/api/location/location_api.h',
-      'browser/extensions/api/location/location_manager.cc',
-      'browser/extensions/api/location/location_manager.h',
+#      'browser/extensions/api/location/location_api.cc',
+#      'browser/extensions/api/location/location_api.h',
+#      'browser/extensions/api/location/location_manager.cc',
+#      'browser/extensions/api/location/location_manager.h',
       'browser/extensions/api/management/chrome_management_api_delegate.cc',
       'browser/extensions/api/management/chrome_management_api_delegate.h',
-      'browser/extensions/api/mdns/dns_sd_delegate.cc',
-      'browser/extensions/api/mdns/dns_sd_delegate.h',
-      'browser/extensions/api/mdns/dns_sd_device_lister.cc',
-      'browser/extensions/api/mdns/dns_sd_device_lister.h',
-      'browser/extensions/api/mdns/dns_sd_registry.cc',
-      'browser/extensions/api/mdns/dns_sd_registry.h',
-      'browser/extensions/api/mdns/mdns_api.cc',
-      'browser/extensions/api/mdns/mdns_api.h',
+#      'browser/extensions/api/mdns/dns_sd_delegate.cc',
+#      'browser/extensions/api/mdns/dns_sd_delegate.h',
+#      'browser/extensions/api/mdns/dns_sd_device_lister.cc',
+#      'browser/extensions/api/mdns/dns_sd_device_lister.h',
+#      'browser/extensions/api/mdns/dns_sd_registry.cc',
+#      'browser/extensions/api/mdns/dns_sd_registry.h',
+#      'browser/extensions/api/mdns/mdns_api.cc',
+#      'browser/extensions/api/mdns/mdns_api.h',
       'browser/extensions/api/media_galleries/media_galleries_api.cc',
       'browser/extensions/api/media_galleries/media_galleries_api.h',
       'browser/extensions/api/messaging/extension_message_port.cc',
@@ -317,29 +318,31 @@
       'browser/extensions/api/messaging/native_messaging_host_manifest.h',
       'browser/extensions/api/messaging/native_messaging_policy_handler.cc',
       'browser/extensions/api/messaging/native_messaging_policy_handler.h',
-      'browser/extensions/api/metrics_private/metrics_private_api.cc',
-      'browser/extensions/api/metrics_private/metrics_private_api.h',
+#      'browser/extensions/api/metrics_private/metrics_private_api.cc',
+#      'browser/extensions/api/metrics_private/metrics_private_api.h',
       'browser/extensions/api/module/module.cc',
       'browser/extensions/api/module/module.h',
-      'browser/extensions/api/music_manager_private/device_id.cc',
-      'browser/extensions/api/music_manager_private/device_id.h',
-      'browser/extensions/api/music_manager_private/device_id_chromeos.cc',
-      'browser/extensions/api/music_manager_private/device_id_linux.cc',
-      'browser/extensions/api/music_manager_private/device_id_mac.cc',
-      'browser/extensions/api/music_manager_private/device_id_win.cc',
-      'browser/extensions/api/music_manager_private/music_manager_private_api.cc',
-      'browser/extensions/api/music_manager_private/music_manager_private_api.h',
+#      'browser/extensions/api/music_manager_private/device_id.cc',
+#      'browser/extensions/api/music_manager_private/device_id.h',
+#      'browser/extensions/api/music_manager_private/device_id_chromeos.cc',
+#      'browser/extensions/api/music_manager_private/device_id_linux.cc',
+#      'browser/extensions/api/music_manager_private/device_id_mac.cc',
+#      'browser/extensions/api/music_manager_private/device_id_win.cc',
+#      'browser/extensions/api/music_manager_private/music_manager_private_api.cc',
+#      'browser/extensions/api/music_manager_private/music_manager_private_api.h',
       'browser/extensions/api/networking_private/networking_private_credentials_getter_chromeos.cc',
       'browser/extensions/api/networking_private/networking_private_verify_delegate_factory_impl.cc',
       'browser/extensions/api/networking_private/networking_private_verify_delegate_factory_impl.h',
-      'browser/extensions/api/notification_provider/notification_provider_api.cc',
-      'browser/extensions/api/notification_provider/notification_provider_api.h',
-      'browser/extensions/api/notifications/notifications_api.cc',
-      'browser/extensions/api/notifications/notifications_api.h',
+#      'browser/extensions/api/notification_provider/notification_provider_api.cc',
+#      'browser/extensions/api/notification_provider/notification_provider_api.h',
+#      'browser/extensions/api/notifications/notifications_api.cc',
+#      'browser/extensions/api/notifications/notifications_api.h',
       'browser/extensions/api/omnibox/omnibox_api.cc',
       'browser/extensions/api/omnibox/omnibox_api.h',
+#TODO: get rid of:
       'browser/extensions/api/page_capture/page_capture_api.cc',
       'browser/extensions/api/page_capture/page_capture_api.h',
+      
       'browser/extensions/api/permissions/permissions_api.cc',
       'browser/extensions/api/permissions/permissions_api.h',
       'browser/extensions/api/permissions/permissions_api_helpers.cc',
@@ -368,32 +371,32 @@
       'browser/extensions/api/proxy/proxy_api_constants.h',
       'browser/extensions/api/proxy/proxy_api_helpers.cc',
       'browser/extensions/api/proxy/proxy_api_helpers.h',
-      'browser/extensions/api/push_messaging/obfuscated_gaia_id_fetcher.cc',
-      'browser/extensions/api/push_messaging/obfuscated_gaia_id_fetcher.h',
-      'browser/extensions/api/push_messaging/push_messaging_api.cc',
-      'browser/extensions/api/push_messaging/push_messaging_api.h',
-      'browser/extensions/api/push_messaging/push_messaging_invalidation_handler.cc',
-      'browser/extensions/api/push_messaging/push_messaging_invalidation_handler.h',
-      'browser/extensions/api/push_messaging/push_messaging_invalidation_handler_delegate.h',
-      'browser/extensions/api/push_messaging/push_messaging_invalidation_mapper.h',
+#      'browser/extensions/api/push_messaging/obfuscated_gaia_id_fetcher.cc',
+#      'browser/extensions/api/push_messaging/obfuscated_gaia_id_fetcher.h',
+#      'browser/extensions/api/push_messaging/push_messaging_api.cc',
+#      'browser/extensions/api/push_messaging/push_messaging_api.h',
+#      'browser/extensions/api/push_messaging/push_messaging_invalidation_handler.cc',
+#      'browser/extensions/api/push_messaging/push_messaging_invalidation_handler.h',
+#      'browser/extensions/api/push_messaging/push_messaging_invalidation_handler_delegate.h',
+#      'browser/extensions/api/push_messaging/push_messaging_invalidation_mapper.h',
       'browser/extensions/api/reading_list_private/reading_list_private_api.cc',
       'browser/extensions/api/reading_list_private/reading_list_private_api.h',
       'browser/extensions/api/runtime/chrome_runtime_api_delegate.cc',
       'browser/extensions/api/runtime/chrome_runtime_api_delegate.h',
-      'browser/extensions/api/screenlock_private/screenlock_private_api.cc',
-      'browser/extensions/api/screenlock_private/screenlock_private_api.h',
+#      'browser/extensions/api/screenlock_private/screenlock_private_api.cc',
+#      'browser/extensions/api/screenlock_private/screenlock_private_api.h',
       'browser/extensions/api/sessions/session_id.cc',
       'browser/extensions/api/sessions/session_id.h',
       'browser/extensions/api/sessions/sessions_api.cc',
       'browser/extensions/api/sessions/sessions_api.h',
       'browser/extensions/api/settings_overrides/settings_overrides_api.cc',
       'browser/extensions/api/settings_overrides/settings_overrides_api.h',
-      'browser/extensions/api/signed_in_devices/id_mapping_helper.cc',
-      'browser/extensions/api/signed_in_devices/id_mapping_helper.h',
-      'browser/extensions/api/signed_in_devices/signed_in_devices_api.cc',
-      'browser/extensions/api/signed_in_devices/signed_in_devices_api.h',
-      'browser/extensions/api/signed_in_devices/signed_in_devices_manager.cc',
-      'browser/extensions/api/signed_in_devices/signed_in_devices_manager.h',
+#      'browser/extensions/api/signed_in_devices/id_mapping_helper.cc',
+#      'browser/extensions/api/signed_in_devices/id_mapping_helper.h',
+#      'browser/extensions/api/signed_in_devices/signed_in_devices_api.cc',
+#      'browser/extensions/api/signed_in_devices/signed_in_devices_api.h',
+#      'browser/extensions/api/signed_in_devices/signed_in_devices_manager.cc',
+#      'browser/extensions/api/signed_in_devices/signed_in_devices_manager.h',
       'browser/extensions/api/spellcheck/spellcheck_api.cc',
       'browser/extensions/api/spellcheck/spellcheck_api.h',
       'browser/extensions/api/storage/setting_sync_data.cc',
@@ -416,13 +419,16 @@
       'browser/extensions/api/sync_file_system/sync_file_system_api.h',
       'browser/extensions/api/sync_file_system/sync_file_system_api_helpers.cc',
       'browser/extensions/api/sync_file_system/sync_file_system_api_helpers.h',
+      #TODO: maybe not needed if it's for apps not extensions:
       'browser/extensions/api/system_indicator/system_indicator_api.h',
       'browser/extensions/api/system_indicator/system_indicator_manager.cc',
       'browser/extensions/api/system_indicator/system_indicator_manager.h',
       'browser/extensions/api/system_indicator/system_indicator_manager_factory.cc',
       'browser/extensions/api/system_indicator/system_indicator_manager_factory.h',
+      #TODO: probably this too:
       'browser/extensions/api/system_private/system_private_api.cc',
       'browser/extensions/api/system_private/system_private_api.h',
+      
       'browser/extensions/api/tab_capture/tab_capture_api.cc',
       'browser/extensions/api/tab_capture/tab_capture_api.h',
       'browser/extensions/api/tab_capture/tab_capture_registry.cc',
@@ -453,13 +459,15 @@
       'browser/extensions/api/web_request/chrome_extension_web_request_event_router_delegate.h',
       'browser/extensions/api/web_view/chrome_web_view_internal_api.cc',
       'browser/extensions/api/web_view/chrome_web_view_internal_api.h',
-      'browser/extensions/api/webrtc_audio_private/webrtc_audio_private_api.cc',
-      'browser/extensions/api/webrtc_audio_private/webrtc_audio_private_api.h',
-      'browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.h',
+#      'browser/extensions/api/webrtc_audio_private/webrtc_audio_private_api.cc',
+#      'browser/extensions/api/webrtc_audio_private/webrtc_audio_private_api.h',
+#      'browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.h',
+
       'browser/extensions/api/webstore/webstore_api.cc',
       'browser/extensions/api/webstore/webstore_api.h',
       'browser/extensions/api/webstore_private/webstore_private_api.cc',
       'browser/extensions/api/webstore_private/webstore_private_api.h',
+#TODO: is this needed? app.json
       'browser/extensions/app_data_migrator.cc',
       'browser/extensions/app_data_migrator.h',
       'browser/extensions/app_icon_loader.h',
@@ -469,12 +477,12 @@
       'browser/extensions/app_sync_bundle.h',
       'browser/extensions/app_sync_data.cc',
       'browser/extensions/app_sync_data.h',
-      'browser/extensions/blacklist.cc',
-      'browser/extensions/blacklist.h',
-      'browser/extensions/blacklist_factory.cc',
-      'browser/extensions/blacklist_factory.h',
-      'browser/extensions/blacklist_state_fetcher.cc',
-      'browser/extensions/blacklist_state_fetcher.h',
+#      'browser/extensions/blacklist.cc',
+#      'browser/extensions/blacklist.h',
+#      'browser/extensions/blacklist_factory.cc',
+#      'browser/extensions/blacklist_factory.h',
+#      'browser/extensions/blacklist_state_fetcher.cc',
+#      'browser/extensions/blacklist_state_fetcher.h',
       'browser/extensions/blob_reader.cc',
       'browser/extensions/blob_reader.h',
       'browser/extensions/bookmark_app_helper.cc',
@@ -486,8 +494,10 @@
       'browser/extensions/browser_extension_window_controller.h',
       'browser/extensions/browser_permissions_policy_delegate.cc',
       'browser/extensions/browser_permissions_policy_delegate.h',
+#TODO: this needed?
       'browser/extensions/bundle_installer.cc',
       'browser/extensions/bundle_installer.h',
+      
       'browser/extensions/chrome_app_sorting.cc',
       'browser/extensions/chrome_app_sorting.h',
       'browser/extensions/chrome_component_extension_resource_manager.cc',
@@ -608,10 +618,10 @@
       'browser/extensions/extension_service.h',
       'browser/extensions/extension_special_storage_policy.cc',
       'browser/extensions/extension_special_storage_policy.h',
-      'browser/extensions/extension_storage_monitor.cc',
-      'browser/extensions/extension_storage_monitor.h',
-      'browser/extensions/extension_storage_monitor_factory.cc',
-      'browser/extensions/extension_storage_monitor_factory.h',
+#      'browser/extensions/extension_storage_monitor.cc',
+#      'browser/extensions/extension_storage_monitor.h',
+#      'browser/extensions/extension_storage_monitor_factory.cc',
+#      'browser/extensions/extension_storage_monitor_factory.h',
       'browser/extensions/extension_sync_bundle.cc',
       'browser/extensions/extension_sync_bundle.h',
       'browser/extensions/extension_sync_data.cc',
@@ -700,8 +710,10 @@
       'browser/extensions/menu_manager_factory.h',
       'browser/extensions/navigation_observer.cc',
       'browser/extensions/navigation_observer.h',
+      #TODO:
       'browser/extensions/ntp_overridden_bubble_controller.cc',
       'browser/extensions/ntp_overridden_bubble_controller.h',
+      
       'browser/extensions/pack_extension_job.cc',
       'browser/extensions/pack_extension_job.h',
       'browser/extensions/path_util.cc',
@@ -728,10 +740,13 @@
       'browser/extensions/shared_module_service.h',
       'browser/extensions/shared_user_script_master.cc',
       'browser/extensions/shared_user_script_master.h',
+      
+      #TODO:
       'browser/extensions/signin/gaia_auth_extension_loader.cc',
       'browser/extensions/signin/gaia_auth_extension_loader.h',
       'browser/extensions/signin/scoped_gaia_auth_extension.cc',
       'browser/extensions/signin/scoped_gaia_auth_extension.h',
+      
       'browser/extensions/standard_management_policy_provider.cc',
       'browser/extensions/standard_management_policy_provider.h',
       'browser/extensions/startup_helper.cc',
@@ -743,8 +758,10 @@
       'browser/extensions/sync_bundle.h',
       'browser/extensions/tab_helper.cc',
       'browser/extensions/tab_helper.h',
+      #TODO:
       'browser/extensions/theme_installed_infobar_delegate.cc',
       'browser/extensions/theme_installed_infobar_delegate.h',
+      
       'browser/extensions/token_cache/token_cache_service.cc',
       'browser/extensions/token_cache/token_cache_service.h',
       'browser/extensions/token_cache/token_cache_service_factory.cc',
@@ -788,6 +805,7 @@
       'browser/extensions/window_controller_list_observer.h',
       'browser/extensions/zipfile_installer.cc',
       'browser/extensions/zipfile_installer.h',
+      #TODO:
       'browser/web_applications/update_shortcut_worker_win.cc',
       'browser/web_applications/update_shortcut_worker_win.h',
       'browser/web_applications/web_app.cc',
@@ -863,7 +881,8 @@
         '../components/components.gyp:copresence',
         '../components/components.gyp:history_core_browser_proto',
         '../components/components.gyp:onc_component',
-        '../components/components.gyp:proximity_auth',
+#        '../components/components.gyp:proximity_auth',
+#TODO: what is that:
         '../components/components.gyp:update_client',
         '../components/components.gyp:url_matcher',
         '../components/components_strings.gyp:components_strings',
@@ -871,8 +890,8 @@
         '../content/content.gyp:content_browser',
         '../content/content.gyp:content_common',
         '../crypto/crypto.gyp:crypto',
-        '../device/bluetooth/bluetooth.gyp:device_bluetooth',
-        '../device/hid/hid.gyp:device_hid',
+#        '../device/bluetooth/bluetooth.gyp:device_bluetooth',
+#        '../device/hid/hid.gyp:device_hid',
         '../extensions/browser/api/api_registration.gyp:extensions_api_registration',
         '../extensions/common/api/api.gyp:extensions_api',
         '../extensions/extensions.gyp:extensions_browser',
@@ -1031,11 +1050,13 @@
         }],
         ['enable_webrtc==1', {
           'sources': [
-            'browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc',
+#            'browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc',
           ],
         }, {
           'sources': [
-            'browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api_stub.cc',
+          #no effect when gn
+#            'browser/extensions/api/webrtc_logging_private.h',
+#            'browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api_stub.cc',
           ],
         }],
         ['use_brlapi==1', {
@@ -1050,7 +1071,7 @@
           ],
         }, {  # use_brlapi==0
           'sources': [
-            'browser/extensions/api/braille_display_private/braille_controller_stub.cc',
+#            'browser/extensions/api/braille_display_private/braille_controller_stub.cc',
           ],
         }],
       ],
diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi
index f22f6b4..593477b 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -810,8 +810,8 @@
       'browser/ui/profile_error_dialog.cc',
       'browser/ui/profile_error_dialog.h',
       'browser/ui/protocol_dialog_delegate.h',
-      'browser/ui/proximity_auth/proximity_auth_error_bubble.cc',
-      'browser/ui/proximity_auth/proximity_auth_error_bubble.h',
+#      'browser/ui/proximity_auth/proximity_auth_error_bubble.cc',
+#      'browser/ui/proximity_auth/proximity_auth_error_bubble.h',
       'browser/ui/screen_capture_notification_ui.h',
       'browser/ui/search/instant_controller.cc',
       'browser/ui/search/instant_controller.h',
@@ -1689,7 +1689,7 @@
       'browser/ui/webui/options/advanced_options_utils_linux.cc',
       'browser/ui/webui/options/advanced_options_utils_mac.mm',
       'browser/ui/webui/options/advanced_options_utils_win.cc',
-      'browser/ui/webui/options/autofill_options_handler.cc',
+#      'browser/ui/webui/options/autofill_options_handler.cc',
       'browser/ui/webui/options/autofill_options_handler.h',
       'browser/ui/webui/options/automatic_settings_reset_handler.cc',
       'browser/ui/webui/options/automatic_settings_reset_handler.h',
@@ -2410,12 +2410,12 @@
       'browser/ui/app_list/search/omnibox_provider.h',
       'browser/ui/app_list/search/omnibox_result.cc',
       'browser/ui/app_list/search/omnibox_result.h',
-      'browser/ui/app_list/search/people/people_provider.cc',
-      'browser/ui/app_list/search/people/people_provider.h',
-      'browser/ui/app_list/search/people/people_result.cc',
-      'browser/ui/app_list/search/people/people_result.h',
-      'browser/ui/app_list/search/people/person.cc',
-      'browser/ui/app_list/search/people/person.h',
+#      'browser/ui/app_list/search/people/people_provider.cc',
+#      'browser/ui/app_list/search/people/people_provider.h',
+#      'browser/ui/app_list/search/people/people_result.cc',
+#      'browser/ui/app_list/search/people/people_result.h',
+#      'browser/ui/app_list/search/people/person.cc',
+#      'browser/ui/app_list/search/people/person.h',
       'browser/ui/app_list/search/search_controller_factory.cc',
       'browser/ui/app_list/search/search_controller_factory.h',
       'browser/ui/app_list/search/search_resource_manager.cc',
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index 6a80c5b..c19d34b 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -28,16 +28,16 @@
       'common/chrome_version_info_mac.mm',
       'common/chrome_version_info_posix.cc',
       'common/chrome_version_info_win.cc',
-      'common/cloud_print/cloud_print_cdd_conversion.cc',
-      'common/cloud_print/cloud_print_cdd_conversion.h',
-      'common/cloud_print/cloud_print_class_mac.h',
-      'common/cloud_print/cloud_print_class_mac.mm',
-      'common/cloud_print/cloud_print_constants.cc',
-      'common/cloud_print/cloud_print_constants.h',
-      'common/cloud_print/cloud_print_helpers.cc',
-      'common/cloud_print/cloud_print_helpers.h',
-      'common/cloud_print/cloud_print_proxy_info.cc',
-      'common/cloud_print/cloud_print_proxy_info.h',
+#      'common/cloud_print/cloud_print_cdd_conversion.cc',
+#      'common/cloud_print/cloud_print_cdd_conversion.h',
+#      'common/cloud_print/cloud_print_class_mac.h',
+#      'common/cloud_print/cloud_print_class_mac.mm',
+#      'common/cloud_print/cloud_print_constants.cc',
+#      'common/cloud_print/cloud_print_constants.h',
+#      'common/cloud_print/cloud_print_helpers.cc',
+#      'common/cloud_print/cloud_print_helpers.h',
+#      'common/cloud_print/cloud_print_proxy_info.cc',
+#      'common/cloud_print/cloud_print_proxy_info.h',
       'common/common_message_generator.cc',
       'common/common_message_generator.h',
       'common/common_param_traits.cc',
@@ -75,9 +75,9 @@
       'common/mac/launchd.mm',
       'common/mac/objc_zombie.h',
       'common/mac/objc_zombie.mm',
-      'common/media/webrtc_logging_message_data.cc',
-      'common/media/webrtc_logging_message_data.h',
-      'common/media/webrtc_logging_messages.h',
+#      'common/media/webrtc_logging_message_data.cc',
+#      'common/media/webrtc_logging_message_data.h',
+#      'common/media/webrtc_logging_messages.h',
       'common/media_galleries/metadata_types.h',
       'common/multi_process_lock.h',
       'common/multi_process_lock_linux.cc',
@@ -108,9 +108,9 @@
       'common/switch_utils.h',
       'common/terminate_on_heap_corruption_experiment_win.cc',
       'common/terminate_on_heap_corruption_experiment_win.h',
-      'common/tts_messages.h',
-      'common/tts_utterance_request.cc',
-      'common/tts_utterance_request.h',
+#      'common/tts_messages.h',
+#      'common/tts_utterance_request.cc',
+#      'common/tts_utterance_request.h',
       'common/url_constants.cc',
       'common/url_constants.h',
       'common/v8_breakpad_support_win.cc',
@@ -133,14 +133,14 @@
       'common/extensions/api/file_browser_handlers/file_browser_handler.h',
       'common/extensions/api/input_ime/input_components_handler.cc',
       'common/extensions/api/input_ime/input_components_handler.h',
-      'common/extensions/api/notifications/notification_style.cc',
-      'common/extensions/api/notifications/notification_style.h',
+#      'common/extensions/api/notifications/notification_style.cc',
+#      'common/extensions/api/notifications/notification_style.h',
       'common/extensions/api/omnibox/omnibox_handler.cc',
       'common/extensions/api/omnibox/omnibox_handler.h',
-      'common/extensions/api/plugins/plugins_handler.cc',
-      'common/extensions/api/plugins/plugins_handler.h',
-      'common/extensions/api/speech/tts_engine_manifest_handler.cc',
-      'common/extensions/api/speech/tts_engine_manifest_handler.h',
+#      'common/extensions/api/plugins/plugins_handler.cc',
+#      'common/extensions/api/plugins/plugins_handler.h',
+#      'common/extensions/api/speech/tts_engine_manifest_handler.cc',
+#      'common/extensions/api/speech/tts_engine_manifest_handler.h',
       'common/extensions/api/spellcheck/spellcheck_handler.cc',
       'common/extensions/api/spellcheck/spellcheck_handler.h',
       'common/extensions/api/storage/storage_schema_manifest_handler.cc',
@@ -165,16 +165,16 @@
       'common/extensions/command.h',
       'common/extensions/extension_constants.cc',
       'common/extensions/extension_constants.h',
-      'common/extensions/extension_metrics.cc',
-      'common/extensions/extension_metrics.h',
+#      'common/extensions/extension_metrics.cc',
+#      'common/extensions/extension_metrics.h',
       'common/extensions/extension_process_policy.cc',
       'common/extensions/extension_process_policy.h',
       'common/extensions/features/chrome_channel_feature_filter.cc',
       'common/extensions/features/chrome_channel_feature_filter.h',
       'common/extensions/features/feature_channel.cc',
       'common/extensions/features/feature_channel.h',
-      'common/extensions/image_writer/image_writer_util_mac.cc',
-      'common/extensions/image_writer/image_writer_util_mac.h',
+#      'common/extensions/image_writer/image_writer_util_mac.cc',
+#      'common/extensions/image_writer/image_writer_util_mac.h',
       'common/extensions/manifest_handlers/app_icon_color_info.cc',
       'common/extensions/manifest_handlers/app_icon_color_info.h',
       'common/extensions/manifest_handlers/app_isolation_info.cc',
diff --git a/chrome/chrome_renderer.gypi b/chrome/chrome_renderer.gypi
index 65878f6..839951c 100644
--- a/chrome/chrome_renderer.gypi
+++ b/chrome/chrome_renderer.gypi
@@ -156,7 +156,7 @@
       'renderer/resources/extensions/file_system_provider_custom_bindings.js',
       'renderer/resources/extensions/gcm_custom_bindings.js',
       'renderer/resources/extensions/identity_custom_bindings.js',
-      'renderer/resources/extensions/image_writer_private_custom_bindings.js',
+#      'renderer/resources/extensions/image_writer_private_custom_bindings.js',
       'renderer/resources/extensions/input.ime_custom_bindings.js',
       'renderer/resources/extensions/log_private_custom_bindings.js',
       'renderer/resources/extensions/notifications_custom_bindings.js',
diff --git a/chrome/chrome_repack_locales.gni b/chrome/chrome_repack_locales.gni
index ea9b432..06d7a5a 100644
--- a/chrome/chrome_repack_locales.gni
+++ b/chrome/chrome_repack_locales.gni
@@ -68,14 +68,14 @@ template("_repack_one_locale") {
     }
     if (enable_extensions) {
       sources += [
-        "${root_gen_dir}/device/bluetooth/device_bluetooth_strings_${locale}.pak",
+#        "${root_gen_dir}/device/bluetooth/device_bluetooth_strings_${locale}.pak",
 
         # TODO(jamescook): When Android stops building extensions code move
         # this to the OS != 'ios' and OS != 'android' section.
         "${root_gen_dir}/extensions/strings/extensions_strings_${locale}.pak",
       ]
       deps += [
-        "//device/bluetooth:strings",
+#        "//device/bluetooth:strings",
         "//extensions/strings",
       ]
     }
diff --git a/chrome/chrome_utility.gypi b/chrome/chrome_utility.gypi
index 9c13e8e..8ce2a8c 100644
--- a/chrome/chrome_utility.gypi
+++ b/chrome/chrome_utility.gypi
@@ -26,16 +26,16 @@
     'chrome_utility_extensions_sources': [
       'utility/extensions/extensions_handler.cc',
       'utility/extensions/extensions_handler.h',
-      'utility/image_writer/disk_unmounter_mac.cc',
-      'utility/image_writer/disk_unmounter_mac.h',
-      'utility/image_writer/error_messages.cc',
-      'utility/image_writer/error_messages.h',
-      'utility/image_writer/image_writer.cc',
-      'utility/image_writer/image_writer.h',
-      'utility/image_writer/image_writer_handler.cc',
-      'utility/image_writer/image_writer_handler.h',
-      'utility/image_writer/image_writer_mac.cc',
-      'utility/image_writer/image_writer_win.cc',
+#      'utility/image_writer/disk_unmounter_mac.cc',
+#      'utility/image_writer/disk_unmounter_mac.h',
+#      'utility/image_writer/error_messages.cc',
+#      'utility/image_writer/error_messages.h',
+#      'utility/image_writer/image_writer.cc',
+#      'utility/image_writer/image_writer.h',
+#      'utility/image_writer/image_writer_handler.cc',
+#      'utility/image_writer/image_writer_handler.h',
+#      'utility/image_writer/image_writer_mac.cc',
+#      'utility/image_writer/image_writer_win.cc',
     ],
     'chrome_utility_importer_sources': [
       'utility/importer/bookmark_html_reader.cc',
@@ -175,7 +175,7 @@
               ],
             }, {  # OS!="win" and OS!="mac"
               'sources': [
-                'utility/image_writer/image_writer_stub.cc',
+#                'utility/image_writer/image_writer_stub.cc',
               ]
             }],
             ['OS=="mac"', {
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index 87f1e06..481928d 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -10,10 +10,10 @@
 #include "build/build_config.h"
 
 #include "base/base_switches.h"
-#include "components/autofill/core/common/autofill_switches.h"
+//#include "components/autofill/core/common/autofill_switches.h"
 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_switches.h"
-#include "components/password_manager/core/common/password_manager_switches.h"
-#include "components/signin/core/common/signin_switches.h"
+//#include "components/password_manager/core/common/password_manager_switches.h"
+//#include "components/signin/core/common/signin_switches.h"
 #include "content/public/common/content_switches.h"
 
 namespace switches {
diff --git a/chrome/common/chrome_utility_messages.h b/chrome/common/chrome_utility_messages.h
index 5f07459..4705ea6 100644
--- a/chrome/common/chrome_utility_messages.h
+++ b/chrome/common/chrome_utility_messages.h
@@ -15,7 +15,9 @@
 #include "base/strings/string16.h"
 #include "base/tuple.h"
 #include "base/values.h"
-#include "chrome/common/safe_browsing/zip_analyzer.h"
+#if defined(FULL_SAFE_BROWSING)
+  #include "chrome/common/safe_browsing/zip_analyzer.h"
+#endif
 #include "ipc/ipc_message_macros.h"
 #include "ipc/ipc_platform_file.h"
 #include "third_party/skia/include/core/SkBitmap.h"
diff --git a/chrome/common/extensions/api/preferences_private.json b/chrome/common/extensions/api/preferences_private.json
index 02a1541..6f8e20c 100644
--- a/chrome/common/extensions/api/preferences_private.json
+++ b/chrome/common/extensions/api/preferences_private.json
@@ -7,12 +7,12 @@
     "namespace": "preferencesPrivate",
     "description": "none",
     "properties": {
-      "easyUnlockProximityRequired": {
-        "nocompile": true,
-        "$ref": "types.private.ChromeDirectSetting",
-        "value": ["easy_unlock.proximity_required", {"type":"boolean"}],
-        "description": "If true, a remote Easy Unlock device can only unlock the local device if it is in very close proximity (roughly, within a foot). This preference's value is a boolean, defaulting to <code>false</code>."
-      },
+//      "easyUnlockProximityRequired": {
+//        "nocompile": true,
+//        "$ref": "types.private.ChromeDirectSetting",
+//        "value": ["easy_unlock.proximity_required", {"type":"boolean"}],
+//        "description": "If true, a remote Easy Unlock device can only unlock the local device if it is in very close proximity (roughly, within a foot). This preference's value is a boolean, defaulting to <code>false</code>."
+//      },
       "googleGeolocationAccessEnabled": {
         "nocompile": true,
         "$ref": "types.private.ChromeDirectSetting",
diff --git a/chrome/common/extensions/api/schemas.gypi b/chrome/common/extensions/api/schemas.gypi
index f29dbc6..1236f83 100644
--- a/chrome/common/extensions/api/schemas.gypi
+++ b/chrome/common/extensions/api/schemas.gypi
@@ -17,10 +17,11 @@
       'autotest_private.idl',
       'bookmark_manager_private.json',
       'bookmarks.json',
-      'braille_display_private.idl',
+#TODO: remove:
+#      'braille_display_private.idl',
       'browser.idl',
       'chrome_web_view_internal.json',
-      'cloud_print_private.json',
+#      'cloud_print_private.json',
       'command_line_private.json',
       'content_settings.json',
       'context_menus_internal.json',
@@ -28,51 +29,54 @@
       'cookies.json',
       'copresence.idl',
       'copresence_private.idl',
+#TODO; what is this:
       'cryptotoken_private.idl',
       'data_reduction_proxy.json',
       'debugger.json',
-      'desktop_capture.json',
+#      'desktop_capture.json',
       'developer_private.idl',
-      'dial.idl',
+#      'dial.idl',
       'downloads.idl',
       'downloads_internal.idl',
-      'easy_unlock_private.idl',
+#      'easy_unlock_private.idl',
       'echo_private.json',
       'enterprise_platform_keys_private.json',
       'experience_sampling_private.json',
-      'feedback_private.idl',
+#      'feedback_private.idl',
       'file_manager_private.idl',
       'file_manager_private_internal.idl',
       'file_system.idl',
       'font_settings.json',
-      'gcd_private.idl',
+#      'gcd_private.idl',
       'gcm.json',
-      'hangouts_private.idl',
+#      'hangouts_private.idl',
       'history.json',
-      'hotword_private.idl',
+#      'hotword_private.idl',
       'i18n.json',
       'identity.idl',
       'identity_private.idl',
-      'image_writer_private.idl',
-      'inline_install_private.idl',
+#      'image_writer_private.idl',
+#      'inline_install_private.idl',
       'input_ime.json',
       'launcher_page.idl',
-      'location.idl',
+#      'location.idl',
       'manifest_types.json',
-      'mdns.idl',
+#      'mdns.idl',
       'media_galleries.idl',
-      'metrics_private.json',
-      'notification_provider.idl',
-      'notifications.idl',
+#TODO: is this needed:
+#      'metrics_private.json',
+#      'notification_provider.idl',
+#      'notifications.idl',
+
       'omnibox.json',
       'page_capture.json',
       'permissions.json',
       'preferences_private.json',
-      'push_messaging.idl',
+#      'push_messaging.idl',
       'reading_list_private.json',
-      'screenlock_private.idl',
+#      'screenlock_private.idl',
       'sessions.json',
-      'signed_in_devices.idl',
+#      'signed_in_devices.idl',
       'streams_private.idl',
       'sync_file_system.idl',
       'system_indicator.idl',
@@ -85,8 +89,8 @@
       # Despite the name, this API does not rely on any
       # WebRTC-specific bits and as such does not belong in
       # the enable_webrtc==0 section below.
-      'webrtc_audio_private.idl',
-      'webrtc_logging_private.idl',
+#      'webrtc_audio_private.idl',
+#      'webrtc_logging_private.idl',
       'webstore_private.json',
       'windows.json',
     ],
@@ -99,7 +103,7 @@
       'extension.json',
       'idltest.idl',
       'media_player_private.json',
-      'music_manager_private.idl',
+#      'music_manager_private.idl',
       'principals_private.idl',
       'top_sites.json',
     ],
@@ -119,6 +123,7 @@
       'wallpaper_private.json',
     ],
 
+#TODO: check if this is removed:
     'webrtc_schema_files': [
       'cast_streaming_rtp_stream.idl',
       'cast_streaming_session.idl',
diff --git a/chrome/common/extensions_api_resources.grd b/chrome/common/extensions_api_resources.grd
index ec1ac98..3ddf555 100644
--- a/chrome/common/extensions_api_resources.grd
+++ b/chrome/common/extensions_api_resources.grd
@@ -19,8 +19,9 @@
       <include name="IDR_EXTENSION_API_JSON_PRIVACY" file="extensions\api\privacy.json" type="BINDATA" />
       <include name="IDR_EXTENSION_API_JSON_PROCESSES" file="extensions\api\processes.json" type="BINDATA" />
       <include name="IDR_EXTENSION_API_JSON_PROXY" file="extensions\api\proxy.json" type="BINDATA" />
-      <include name="IDR_EXTENSION_API_JSON_TTS" file="extensions\api\tts.json" type="BINDATA" />
+<!--      <include name="IDR_EXTENSION_API_JSON_TTS" file="extensions\api\tts.json" type="BINDATA" />
       <include name="IDR_EXTENSION_API_JSON_TTSENGINE" file="extensions\api\tts_engine.json" type="BINDATA" />
+      -->
       <include name="IDR_EXTENSION_API_JSON_TYPES" file="extensions\api\types.json" type="BINDATA" />
       <include name="IDR_EXTENSION_API_JSON_TYPES_PRIVATE" file="extensions\api\types_private.json" type="BINDATA" />
       <include name="IDR_EXTENSION_API_JSON_WEBSTORE" file="extensions\api\webstore.json" type="BINDATA" />
diff --git a/chrome/renderer/extensions/chrome_extensions_dispatcher_delegate.cc b/chrome/renderer/extensions/chrome_extensions_dispatcher_delegate.cc
index 88df7cb..5c6bdf3 100644
--- a/chrome/renderer/extensions/chrome_extensions_dispatcher_delegate.cc
+++ b/chrome/renderer/extensions/chrome_extensions_dispatcher_delegate.cc
@@ -150,8 +150,8 @@ void ChromeExtensionsDispatcherDelegate::PopulateSourceMap(
                              IDR_BROWSER_ACTION_CUSTOM_BINDINGS_JS);
   source_map->RegisterSource("declarativeContent",
                              IDR_DECLARATIVE_CONTENT_CUSTOM_BINDINGS_JS);
-  source_map->RegisterSource("desktopCapture",
-                             IDR_DESKTOP_CAPTURE_CUSTOM_BINDINGS_JS);
+//  source_map->RegisterSource("desktopCapture",
+//                             IDR_DESKTOP_CAPTURE_CUSTOM_BINDINGS_JS);
   source_map->RegisterSource("developerPrivate",
                              IDR_DEVELOPER_PRIVATE_CUSTOM_BINDINGS_JS);
   source_map->RegisterSource("downloads", IDR_DOWNLOADS_CUSTOM_BINDINGS_JS);
@@ -165,8 +165,8 @@ void ChromeExtensionsDispatcherDelegate::PopulateSourceMap(
                              IDR_ENTERPRISE_PLATFORM_KEYS_SUBTLE_CRYPTO_JS);
   source_map->RegisterSource("enterprise.platformKeys.Token",
                              IDR_ENTERPRISE_PLATFORM_KEYS_TOKEN_JS);
-  source_map->RegisterSource("feedbackPrivate",
-                             IDR_FEEDBACK_PRIVATE_CUSTOM_BINDINGS_JS);
+//  source_map->RegisterSource("feedbackPrivate",
+//                             IDR_FEEDBACK_PRIVATE_CUSTOM_BINDINGS_JS);
   source_map->RegisterSource("fileBrowserHandler",
                              IDR_FILE_BROWSER_HANDLER_CUSTOM_BINDINGS_JS);
   source_map->RegisterSource("fileManagerPrivate",
@@ -176,14 +176,14 @@ void ChromeExtensionsDispatcherDelegate::PopulateSourceMap(
                              IDR_FILE_SYSTEM_PROVIDER_CUSTOM_BINDINGS_JS);
   source_map->RegisterSource("gcm", IDR_GCM_CUSTOM_BINDINGS_JS);
   source_map->RegisterSource("identity", IDR_IDENTITY_CUSTOM_BINDINGS_JS);
-  source_map->RegisterSource("imageWriterPrivate",
-                             IDR_IMAGE_WRITER_PRIVATE_CUSTOM_BINDINGS_JS);
+//  source_map->RegisterSource("imageWriterPrivate",
+//                             IDR_IMAGE_WRITER_PRIVATE_CUSTOM_BINDINGS_JS);
   source_map->RegisterSource("input.ime", IDR_INPUT_IME_CUSTOM_BINDINGS_JS);
   source_map->RegisterSource("logPrivate", IDR_LOG_PRIVATE_CUSTOM_BINDINGS_JS);
   source_map->RegisterSource("mediaGalleries",
                              IDR_MEDIA_GALLERIES_CUSTOM_BINDINGS_JS);
-  source_map->RegisterSource("notifications",
-                             IDR_NOTIFICATIONS_CUSTOM_BINDINGS_JS);
+//  source_map->RegisterSource("notifications",
+//                             IDR_NOTIFICATIONS_CUSTOM_BINDINGS_JS);
   source_map->RegisterSource("omnibox", IDR_OMNIBOX_CUSTOM_BINDINGS_JS);
   source_map->RegisterSource("pageAction", IDR_PAGE_ACTION_CUSTOM_BINDINGS_JS);
   source_map->RegisterSource("pageCapture",
diff --git a/chrome/renderer/resources/renderer_resources.grd b/chrome/renderer/resources/renderer_resources.grd
index 150ec9e..94c981b 100644
--- a/chrome/renderer/resources/renderer_resources.grd
+++ b/chrome/renderer/resources/renderer_resources.grd
@@ -65,7 +65,7 @@
         <include name="IDR_FILE_SYSTEM_PROVIDER_CUSTOM_BINDINGS_JS" file="extensions\file_system_provider_custom_bindings.js" type="BINDATA" />
         <include name="IDR_GCM_CUSTOM_BINDINGS_JS" file="extensions\gcm_custom_bindings.js" type="BINDATA" />
         <include name="IDR_IDENTITY_CUSTOM_BINDINGS_JS" file="extensions\identity_custom_bindings.js" type="BINDATA" />
-        <include name="IDR_IMAGE_WRITER_PRIVATE_CUSTOM_BINDINGS_JS" file="extensions\image_writer_private_custom_bindings.js" type="BINDATA" />
+<!--        <include name="IDR_IMAGE_WRITER_PRIVATE_CUSTOM_BINDINGS_JS" file="extensions\image_writer_private_custom_bindings.js" type="BINDATA" /> -->
         <include name="IDR_INPUT_IME_CUSTOM_BINDINGS_JS" file="extensions\input.ime_custom_bindings.js" type="BINDATA" />
         <include name="IDR_LOG_PRIVATE_CUSTOM_BINDINGS_JS" file="extensions\log_private_custom_bindings.js" type="BINDATA" />
         <include name="IDR_MEDIA_GALLERIES_CUSTOM_BINDINGS_JS" file="extensions\media_galleries_custom_bindings.js" type="BINDATA" />
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index 8341315..af42812 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -88,22 +88,22 @@ source_set("test_support") {
     "//chrome:strings",
     "//chrome/app:test_support",
 
-    #"//chrome/app/theme:theme_resources",
+    "//chrome/app/theme:theme_resources",
     "//chrome/browser:test_support",
     "//chrome/common:test_support",
     "//chrome/renderer:test_support",
     "//components/bookmarks/test",
     "//components/gcm_driver:test_support",
     "//components/history/core/test:test",
-    "//components/metrics:test_support",
+#    "//components/metrics:test_support",
     "//components/omnibox:test_support",
     "//components/ownership",
-    "//components/password_manager/core/browser:test_support",
+#    "//components/password_manager/core/browser:test_support",
     "//components/pref_registry:test_support",
-    "//components/rappor:test_support",
+#    "//components/rappor:test_support",
     "//components/search_engines:test_support",
-    "//components/signin/core/browser:test_support",
-    "//components/sync_driver:test_support",
+#    "//components/signin/core/browser:test_support",
+#    "//components/sync_driver:test_support",
     "//components/update_client:test_support",
     "//content/public/app:both",
     "//ui/gfx:test_support",
@@ -130,8 +130,8 @@ source_set("test_support") {
       "//content/public/plugin",
       "//content/public/renderer",
       "//content/public/utility",
-      "//components/autofill/core/browser:test_support",
-      "//components/captive_portal:test_support",
+#      "//components/autofill/core/browser:test_support",
+#      "//components/captive_portal:test_support",
       "//components/infobars/core",
       "//components/sessions:test_support",
       "//components/user_manager:test_support",
@@ -623,9 +623,9 @@ if (!is_android) {
       "//chrome/browser",
       "//chrome/common/extensions/api",
       "//chrome/renderer",
-      "//components/autofill/content/browser:risk_proto",
-      "//components/autofill/content/browser:test_support",
-      "//components/captive_portal:test_support",
+#      "//components/autofill/content/browser:risk_proto",
+#      "//components/autofill/content/browser:test_support",
+#      "//components/captive_portal:test_support",
       "//components/dom_distiller/content",
       "//components/dom_distiller/core:test_support",
       "//components/resources",
@@ -634,8 +634,8 @@ if (!is_android) {
       "//components/user_manager:test_support",
       "//crypto:platform",
       "//crypto:test_support",
-      "//device/bluetooth:mocks",
-      "//device/serial:test_support",
+#      "//device/bluetooth:mocks",
+#      "//device/serial:test_support",
       "//extensions/common/api",
       "//google_apis:test_support",
       "//media",
@@ -654,8 +654,8 @@ if (!is_android) {
       "//third_party/icu",
       "//third_party/leveldatabase",
       "//third_party/libaddressinput",
-      "//third_party/libjingle",
-      "//third_party/safe_browsing:test_support",
+#      "//third_party/libjingle",
+#      "//third_party/safe_browsing:test_support",
       "//third_party/widevine/cdm:version_h",
       "//ui/accessibility:test_support",
       "//ui/compositor:test_support",
@@ -947,9 +947,9 @@ if (!is_android) {
       ]
     }
     if (!is_android && !is_ios) {
-      sources +=
-          [ "../browser/copresence/chrome_whispernet_client_browsertest.cc" ]
-      deps += [ "//components/copresence" ]
+#      sources +=
+#          [ "../browser/copresence/chrome_whispernet_client_browsertest.cc" ]
+#      deps += [ "//components/copresence" ]
     }
     if (!is_android && !is_ios && !is_linux) {
       # NPAPI test plugin only works on some platforms.
@@ -987,7 +987,7 @@ if (!is_android) {
         "../browser/ui/webui/print_preview/print_preview_ui_browsertest.cc",
         "data/webui/print_preview.cc",
         "data/webui/print_preview.h",
-        "data/webui/print_preview.js",
+#        "data/webui/print_preview.js",
       ]
     }
     if (enable_mdns) {
@@ -1236,13 +1236,13 @@ if (!is_android) {
 
     if (!is_ios) {
       deps += [
-        "//components/audio_modem:audio_modem_test_support",
-        "//components/autofill/content/browser:test_support",
-        "//components/metrics/proto",
+#        "//components/audio_modem:audio_modem_test_support",
+#        "//components/autofill/content/browser:test_support",
+#        "//components/metrics/proto",
         "//components/data_reduction_proxy/core/browser:test_support",
         "//components/webdata_services:test_support",
         "//components/strings",
-        "//device/bluetooth:mocks",
+#        "//device/bluetooth:mocks",
         "//content/app/resources",
         "//gpu:test_support",
         "//media:test_support",
@@ -1250,8 +1250,8 @@ if (!is_android) {
         #'../ppapi/ppapi_internal.gyp:ppapi_unittest_shared',  TODO(GYP)
         "//third_party/leveldatabase",
         "//third_party/libaddressinput",
-        "//third_party/libjingle",
-        "//third_party/libphonenumber",
+#        "//third_party/libjingle",
+#        "//third_party/libphonenumber",
         "//tools/json_schema_compiler/test",
         "//ui/gl",
         "//v8",
@@ -1682,8 +1682,8 @@ if (!is_android) {
       # crbug.com/354036
       sources -= [ "../browser/chromeos/events/event_rewriter_unittest.cc" ]
     }
-    if (!enable_plugin_installation) {
-      sources -= [ "../browser/plugins/plugin_installer_unittest.cc" ]
-    }
+#    if (!enable_plugin_installation) {
+#      sources -= [ "../browser/plugins/plugin_installer_unittest.cc" ]
+#    }
   }
 }
diff --git a/chrome/test/data/policy/policy_test_cases.json b/chrome/test/data/policy/policy_test_cases.json
index 5b69cb0..78af38e 100644
--- a/chrome/test/data/policy/policy_test_cases.json
+++ b/chrome/test/data/policy/policy_test_cases.json
@@ -2193,13 +2193,13 @@
     ]
   },
 
-  "EasyUnlockAllowed": {
-    "os": ["chromeos"],
-    "test_policy": { "EasyUnlockAllowed": false },
-    "pref_mappings": [
-      { "pref": "easy_unlock.allowed" }
-    ]
-  },
+#  "EasyUnlockAllowed": {
+#    "os": ["chromeos"],
+#    "test_policy": { "EasyUnlockAllowed": false },
+#    "pref_mappings": [
+#      { "pref": "easy_unlock.allowed" }
+#    ]
+#  },
 
   "SessionLocales": {
     "os": ["chromeos"],
diff --git a/chrome/utility/BUILD.gn b/chrome/utility/BUILD.gn
index a99d954..b4b0a7a 100644
--- a/chrome/utility/BUILD.gn
+++ b/chrome/utility/BUILD.gn
@@ -60,7 +60,7 @@ static_library("utility") {
                       "..")
       deps += [ "//components/wifi" ]
     } else {
-      sources += [ "image_writer/image_writer_stub.cc" ]
+#      sources += [ "image_writer/image_writer_stub.cc" ]
     }
 
     if (is_mac) {
diff --git a/chrome/utility/chrome_content_utility_client.cc b/chrome/utility/chrome_content_utility_client.cc
index 843b1f3..d2c7c41 100644
--- a/chrome/utility/chrome_content_utility_client.cc
+++ b/chrome/utility/chrome_content_utility_client.cc
@@ -37,7 +37,7 @@
 #if defined(ENABLE_EXTENSIONS)
 #include "chrome/common/extensions/chrome_utility_extensions_messages.h"
 #include "chrome/utility/extensions/extensions_handler.h"
-#include "chrome/utility/image_writer/image_writer_handler.h"
+//#include "chrome/utility/image_writer/image_writer_handler.h"
 #include "chrome/utility/media_galleries/ipc_data_source.h"
 #include "chrome/utility/media_galleries/media_metadata_parser.h"
 #endif
@@ -84,7 +84,7 @@ ChromeContentUtilityClient::ChromeContentUtilityClient()
 
 #if defined(ENABLE_EXTENSIONS)
   handlers_.push_back(new extensions::ExtensionsHandler());
-  handlers_.push_back(new image_writer::ImageWriterHandler());
+//  handlers_.push_back(new image_writer::ImageWriterHandler());
 #endif
 
 #if defined(ENABLE_PRINT_PREVIEW) || defined(OS_WIN)
diff --git a/components/BUILD.gn b/components/BUILD.gn
index d472b0b..e8dd19c 100644
--- a/components/BUILD.gn
+++ b/components/BUILD.gn
@@ -14,23 +14,23 @@ group("all_components") {
   visibility = [ "//:*" ]  # Only for the root targets to bring in.
 
   deps = [
-    "//components/auto_login_parser",
-    "//components/autofill/content/browser",
-    "//components/autofill/content/common",
-    "//components/autofill/content/renderer",
+#    "//components/auto_login_parser",
+#    "//components/autofill/content/browser",
+#    "//components/autofill/content/common",
+#    "//components/autofill/content/renderer",
     "//components/bookmarks/browser",
     "//components/bookmarks/common",
     "//components/bookmarks/test",
-    "//components/captive_portal",
+#    "//components/captive_portal",
     "//components/cdm/browser",
     "//components/cdm/common",
     "//components/cdm/renderer",
-    "//components/cloud_devices/common",
+#    "//components/cloud_devices/common",
     "//components/component_updater",
     "//components/content_settings/core/browser",
     "//components/content_settings/core/common",
-    "//components/crash/app",
-    "//components/crash/browser",
+#    "//components/crash/app",
+#    "//components/crash/browser",
     "//components/crx_file",
     "//components/data_reduction_proxy/core/browser",
     "//components/data_reduction_proxy/core/common",
@@ -40,9 +40,9 @@ group("all_components") {
     "//components/enhanced_bookmarks",
     "//components/favicon/core",
     "//components/favicon_base",
-    "//components/feedback",
+#    "//components/feedback",
     "//components/gcm_driver",
-    "//components/google/core/browser",
+#    "//components/google/core/browser",
     "//components/history/content/browser",
     "//components/history/core/browser",
     "//components/history/core/common",
@@ -51,44 +51,44 @@ group("all_components") {
     "//components/invalidation",
     "//components/json_schema",
     "//components/keyed_service/content",
-    "//components/language_usage_metrics",
+#    "//components/language_usage_metrics",
     "//components/leveldb_proto",
-    "//components/login",
-    "//components/metrics",
+#    "//components/login",
+#    "//components/metrics",
     "//components/navigation_interception",
-    "//components/navigation_metrics",
+#    "//components/navigation_metrics",
     "//components/network_time",
     "//components/omnibox",
     "//components/onc",
     "//components/os_crypt",
     "//components/packed_ct_ev_whitelist",
-    "//components/pairing",
-    "//components/password_manager/content/browser",
-    "//components/password_manager/core/browser",
-    "//components/password_manager/core/common",
-    "//components/pdf/browser",
-    "//components/pdf/common",
-    "//components/pdf/renderer",
-    "//components/plugins/renderer",
+#    "//components/pairing",
+#    "//components/password_manager/content/browser",
+#    "//components/password_manager/core/browser",
+#    "//components/password_manager/core/common",
+#    "//components/pdf/browser",
+#    "//components/pdf/common",
+#    "//components/pdf/renderer",
+#    "//components/plugins/renderer",
     "//components/policy",
     "//components/power",
     "//components/precache/core",
     "//components/precache/content",
     "//components/pref_registry",
-    "//components/proximity_auth",
-    "//components/proximity_auth/cryptauth",
+#    "//components/proximity_auth",
+#    "//components/proximity_auth/cryptauth",
     "//components/query_parser",
-    "//components/rappor",
+#    "//components/rappor",
     "//components/renderer_context_menu",
     "//components/resources:components_resources",
     "//components/search",
     "//components/search_engines",
     "//components/search_provider_logos",
     "//components/sessions:sessions_content",
-    "//components/signin/core/browser",
-    "//components/startup_metric_utils",
+#    "//components/signin/core/browser",
+#    "//components/startup_metric_utils",
     "//components/strings",
-    "//components/sync_driver",
+#    "//components/sync_driver",
     "//components/tracing",
     "//components/translate/content/browser",
     "//components/translate/content/common",
@@ -113,8 +113,8 @@ group("all_components") {
     "//components/web_resource",
     "//components/webdata/common",
     "//components/webui_generator",
-    "//components/wifi",
-    "//components/wifi_sync",
+#    "//components/wifi",
+#    "//components/wifi_sync",
   ]
 
   if (!enable_configuration_policy) {
@@ -122,12 +122,12 @@ group("all_components") {
   }
 
   if (!is_win && !is_mac) {
-    deps -= [ "//components/wifi" ]
+#    deps -= [ "//components/wifi" ]
   }
   if (!is_chromeos) {
     deps -= [
-      "//components/pairing",
-      "//components/wifi_sync",
+#      "//components/pairing",
+#      "//components/wifi_sync",
     ]
   }
   if (is_ios) {
@@ -139,22 +139,22 @@ group("all_components") {
   }
 
   if (!enable_plugins) {
-    deps -= [
-      "//components/pdf/browser",
-      "//components/pdf/common",
-      "//components/pdf/renderer",
-    ]
+#    deps -= [
+#      "//components/pdf/browser",
+#      "//components/pdf/common",
+#      "//components/pdf/renderer",
+#    ]
   }
 
   if (is_android) {
     deps -= [
-      "//components/autofill/content/browser",  # Blocked on content/blink.
-      "//components/autofill/content/common",  # Blocked on content.
-      "//components/autofill/content/renderer",  # Blocked on content/blink.
-      "//components/crash/app",  # Should work, needs checking.
-      "//components/crash/browser",  # Should work, needs checking.
-      "//components/captive_portal",  # Should work, needs checking.
-      "//components/cloud_devices/common",  # Should work, needs checking.
+#      "//components/autofill/content/browser",  # Blocked on content/blink.
+#      "//components/autofill/content/common",  # Blocked on content.
+#      "//components/autofill/content/renderer",  # Blocked on content/blink.
+#      "//components/crash/app",  # Should work, needs checking.
+#      "//components/crash/browser",  # Should work, needs checking.
+#      "//components/captive_portal",  # Should work, needs checking.
+#      "//components/cloud_devices/common",  # Should work, needs checking.
       "//components/cdm/browser",  # Blocked on content.
       "//components/cdm/common",  # Blocked on content.
       "//components/cdm/renderer",  # Blocked on content.
@@ -164,9 +164,9 @@ group("all_components") {
       "//components/domain_reliability",  # Blocked on content.
       "//components/favicon_base",  # Should work, needs checking.
       "//components/favicon/core",  # Blocked on keyed service.
-      "//components/feedback",  # Blocked on content.
+#      "//components/feedback",  # Blocked on content.
       "//components/gcm_driver",  # Should work, needs checking.
-      "//components/google/core/browser",  # Should work, needs checking.
+#      "//components/google/core/browser",  # Should work, needs checking.
       "//components/history/core/browser",  # Should work, needs checking.
       "//components/history/core/common",  # Should work, needs checking.
       "//components/history/core/test",  # Should work, needs checking.
@@ -176,20 +176,20 @@ group("all_components") {
       "//components/keyed_service/content",  # Blocked on content.
       "//components/navigation_interception",  # Blocked on content.
       "//components/omnibox",  # Should work, needs checking.
-      "//components/password_manager/content/browser",  # Blocked on content.
-      "//components/password_manager/core/browser",  # Should work, needs checking.
-      "//components/password_manager/core/common",  # Should work, needs checking.
-      "//components/plugins/renderer",  # Blocked on blink.
+#      "//components/password_manager/content/browser",  # Blocked on content.
+#      "//components/password_manager/core/browser",  # Should work, needs checking.
+#      "//components/password_manager/core/common",  # Should work, needs checking.
+#      "//components/plugins/renderer",  # Blocked on blink.
       "//components/power",  # Blocked on content.
       "//components/policy",  # Blocked on content (indirectly via autofill).
       "//components/precache/content",  # Blocked on content.
       "//components/precache/core",  # Should work, needs checking.
-      "//components/rappor",  # Should work, needs checking.
+#      "//components/rappor",  # Should work, needs checking.
       "//components/renderer_context_menu",  # Blocked on content.
       "//components/search_engines",  # Should work, needs checking.
       "//components/search_provider_logos",  # Should work, needs checking.
       "//components/sessions:sessions_content",  # Blocked on content.
-      "//components/signin/core/browser",  # Should work, needs checking.
+#      "//components/signin/core/browser",  # Should work, needs checking.
       "//components/translate/content/browser",  # Blocked on content.
       "//components/translate/content/common",  # Blocked on content.
       "//components/translate/content/renderer",  # Blocked on content.
@@ -205,8 +205,8 @@ group("all_components") {
 
   if (!is_ios && !is_android) {
     deps += [
-      "//components/copresence",
-      "//components/storage_monitor",
+#      "//components/copresence",
+#      "//components/storage_monitor",
     ]
   }
 
@@ -232,13 +232,13 @@ test("components_unittests") {
   # (this would at least include the component itself), they should be on the
   # test source set and not here.
   deps = [
-    "//components/auto_login_parser:unit_tests",
-    "//components/autofill/content/browser:unit_tests",
-    "//components/autofill/core/browser:unit_tests",
-    "//components/autofill/core/common:unit_tests",
+#    "//components/auto_login_parser:unit_tests",
+#    "//components/autofill/content/browser:unit_tests",
+#    "//components/autofill/core/browser:unit_tests",
+#    "//components/autofill/core/common:unit_tests",
     "//components/bookmarks/browser:unit_tests",
     "//components/captive_portal:unit_tests",
-    "//components/cloud_devices/common:unit_tests",
+#    "//components/cloud_devices/common:unit_tests",
     "//components/content_settings/core/browser:unit_tests",
     "//components/content_settings/core/common:unit_tests",
     "//components/crx_file:unit_tests",
@@ -249,14 +249,14 @@ test("components_unittests") {
     "//components/dom_distiller/core:unit_tests",
     "//components/domain_reliability:unit_tests",
     "//components/favicon_base:unit_tests",
-    "//components/google/core/browser:unit_tests",
+#    "//components/google/core/browser:unit_tests",
     "//components/invalidation:unittests",
     "//components/login:unit_tests",
-    "//components/metrics:unit_tests",
+#    "//components/metrics:unit_tests",
     "//components/omnibox:unit_tests",
     "//components/ownership:unit_tests",
     "//components/packed_ct_ev_whitelist:unit_tests",
-    "//components/proximity_auth:unit_tests",
+#    "//components/proximity_auth:unit_tests",
     "//components/update_client:unit_tests",
     "//components/variations:unit_tests",
     "//components/web_resource:unit_tests",
diff --git a/components/bookmarks/browser/BUILD.gn b/components/bookmarks/browser/BUILD.gn
index 091b20a..71b9182 100644
--- a/components/bookmarks/browser/BUILD.gn
+++ b/components/bookmarks/browser/BUILD.gn
@@ -46,7 +46,7 @@ source_set("browser") {
     "//components/keyed_service/core",
     "//components/pref_registry",
     "//components/query_parser",
-    "//components/startup_metric_utils",
+#    "//components/startup_metric_utils",
     "//components/strings",
     "//net",
     "//third_party/icu",
diff --git a/components/history/core/browser/BUILD.gn b/components/history/core/browser/BUILD.gn
index 5e8b4f4..82d2b0f 100644
--- a/components/history/core/browser/BUILD.gn
+++ b/components/history/core/browser/BUILD.gn
@@ -79,7 +79,7 @@ static_library("browser") {
     "//components/favicon_base",
     "//components/keyed_service/core",
     "//components/query_parser",
-    "//components/signin/core/browser",
+#    "//components/signin/core/browser",
     "//google_apis",
     "//net",
     "//skia",
diff --git a/components/history/core/browser/web_history_service.cc b/components/history/core/browser/web_history_service.cc
index b4e953e..a7a4a42 100644
--- a/components/history/core/browser/web_history_service.cc
+++ b/components/history/core/browser/web_history_service.cc
@@ -7,12 +7,12 @@
 #include "base/bind.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
-#include "base/metrics/histogram.h"
+//#include "base/metrics/histogram.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
-#include "components/signin/core/browser/signin_manager.h"
+//#include "components/signin/core/browser/signin_manager.h"
 #include "google_apis/gaia/gaia_urls.h"
 #include "google_apis/gaia/google_service_auth_error.h"
 #include "google_apis/gaia/oauth2_token_service.h"
diff --git a/components/invalidation/BUILD.gn b/components/invalidation/BUILD.gn
index a3f835b..9996e6f 100644
--- a/components/invalidation/BUILD.gn
+++ b/components/invalidation/BUILD.gn
@@ -87,9 +87,9 @@ static_library("invalidation") {
     "//components/gcm_driver",
     "//components/keyed_service/core",
     "//components/pref_registry",
-    "//components/signin/core/browser",
+#    "//components/signin/core/browser",
     "//google_apis",
-    "//jingle:notifier",
+#    "//jingle:notifier",
 
     # TODO(sync): Remove this (http://crbug.com/133352);
     "//third_party/protobuf:protobuf_lite",
@@ -148,8 +148,8 @@ static_library("test_support") {
     "//components/gcm_driver:test_support",
     "//components/keyed_service/core",
     "//google_apis",
-    "//jingle:notifier",
-    "//jingle:notifier_test_util",
+#    "//jingle:notifier",
+#    "//jingle:notifier_test_util",
     "//net",
     "//testing/gmock",
     "//third_party/cacheinvalidation",
diff --git a/components/omnibox/BUILD.gn b/components/omnibox/BUILD.gn
index 08ff27d..ea932f8 100644
--- a/components/omnibox/BUILD.gn
+++ b/components/omnibox/BUILD.gn
@@ -38,7 +38,7 @@ static_library("omnibox") {
   ]
 
   public_deps = [
-    "//components/metrics/proto",
+#    "//components/metrics/proto",
   ]
   deps = [
     "//base",
@@ -66,7 +66,7 @@ static_library("test_support") {
   deps = [
     ":omnibox",
     "//base",
-    "//components/metrics/proto",
+#    "//components/metrics/proto",
   ]
 }
 
diff --git a/components/precache/core/precache_database.cc b/components/precache/core/precache_database.cc
index aba25db..a3d3303 100644
--- a/components/precache/core/precache_database.cc
+++ b/components/precache/core/precache_database.cc
@@ -7,7 +7,7 @@
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/message_loop/message_loop.h"
-#include "base/metrics/histogram.h"
+//#include "base/metrics/histogram.h"
 #include "base/time/time.h"
 #include "sql/connection.h"
 #include "sql/transaction.h"
@@ -97,12 +97,12 @@ void PrecacheDatabase::RecordURLPrecached(const GURL& url,
     return;
   }
 
-  if (!was_cached) {
+/*  if (!was_cached) {
     // The precache only counts as overhead if it was downloaded over the
     // network.
     UMA_HISTOGRAM_COUNTS("Precache.DownloadedPrecacheMotivated",
                          static_cast<base::HistogramBase::Sample>(size));
-  }
+  }*/
 
   // Use the URL table to keep track of URLs that are in the cache thanks to
   // precaching. If a row for the URL already exists, than update the timestamp
@@ -134,7 +134,7 @@ void PrecacheDatabase::RecordURLFetched(const GURL& url,
     return;
   }
 
-  base::HistogramBase::Sample size_sample =
+/*  base::HistogramBase::Sample size_sample =
       static_cast<base::HistogramBase::Sample>(size);
   if (!was_cached) {
     // The fetch was served over the network during user browsing, so count it
@@ -153,7 +153,7 @@ void PrecacheDatabase::RecordURLFetched(const GURL& url,
     if (is_connection_cellular) {
       UMA_HISTOGRAM_COUNTS("Precache.Saved.Cellular", size_sample);
     }
-  }
+  }*/
 
   // Since the resource has been fetched during user browsing, remove any record
   // of that URL having been precached from the URL table, if any exists.
diff --git a/components/proximity_auth.gypi b/components/proximity_auth.gypi
deleted file mode 100644
index a4a121d..0000000
diff --git a/components/proximity_auth/BUILD.gn b/components/proximity_auth/BUILD.gn
deleted file mode 100644
index 84f827b..0000000
diff --git a/components/search_engines/BUILD.gn b/components/search_engines/BUILD.gn
index a1cb181..8a75bc0 100644
--- a/components/search_engines/BUILD.gn
+++ b/components/search_engines/BUILD.gn
@@ -42,18 +42,18 @@ static_library("search_engines") {
   ]
 
   public_deps = [
-    "//components/metrics/proto",
+#    "//components/metrics/proto",
   ]
 
   deps = [
     ":prepopulated_engines",
     "//base",
-    "//components/google/core/browser",
+#    "//components/google/core/browser",
     "//components/history/core/browser",
     "//components/keyed_service/core",
-    "//components/metrics/proto",
+#    "//components/metrics/proto",
     "//components/pref_registry",
-    "//components/rappor",
+#    "//components/rappor",
     "//components/strings",
     "//components/url_fixer",
     "//components/webdata/common",
diff --git a/components/suggestions/suggestions_service.cc b/components/suggestions/suggestions_service.cc
index 9c6f2c8..f503caa 100644
--- a/components/suggestions/suggestions_service.cc
+++ b/components/suggestions/suggestions_service.cc
@@ -8,16 +8,16 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop_proxy.h"
-#include "base/metrics/histogram.h"
-#include "base/metrics/sparse_histogram.h"
+//#include "base/metrics/histogram.h"
+//#include "base/metrics/sparse_histogram.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/time/time.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "components/suggestions/blacklist_store.h"
 #include "components/suggestions/suggestions_store.h"
-#include "components/variations/net/variations_http_header_provider.h"
-#include "components/variations/variations_associated_data.h"
+//#include "components/variations/net/variations_http_header_provider.h"
+//#include "components/variations/variations_associated_data.h"
 #include "net/base/escape.h"
 #include "net/base/load_flags.h"
 #include "net/base/net_errors.h"
diff --git a/components/translate/core/browser/BUILD.gn b/components/translate/core/browser/BUILD.gn
index 13728f4..4534b3e 100644
--- a/components/translate/core/browser/BUILD.gn
+++ b/components/translate/core/browser/BUILD.gn
@@ -41,7 +41,7 @@ source_set("browser") {
 
   deps = [
     "//base",
-    "//components/language_usage_metrics",
+#    "//components/language_usage_metrics",
     "//components/resources:components_resources",
     "//components/strings",
     "//components/translate/core/common",
diff --git a/components/variations/entropy_provider.h b/components/variations/entropy_provider.h
index 0fff0b0..54b542d 100644
--- a/components/variations/entropy_provider.h
+++ b/components/variations/entropy_provider.h
@@ -11,7 +11,7 @@
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
-#include "base/metrics/field_trial.h"
+//#include "base/metrics/field_trial.h"
 #include "third_party/mt19937ar/mt19937ar.h"
 
 namespace metrics {
diff --git a/components/variations/net/BUILD.gn b/components/variations/net/BUILD.gn
index 0511046..2b24cd0 100644
--- a/components/variations/net/BUILD.gn
+++ b/components/variations/net/BUILD.gn
@@ -15,8 +15,8 @@ source_set("net") {
   ]
   deps = [
     "//base",
-    "//components/google/core/browser",
-    "//components/metrics",
+#    "//components/google/core/browser",
+#    "//components/metrics",
     "//components/variations/proto",
   ]
 }
diff --git a/components/webdata/common/BUILD.gn b/components/webdata/common/BUILD.gn
index 8f29252..10208f6 100644
--- a/components/webdata/common/BUILD.gn
+++ b/components/webdata/common/BUILD.gn
@@ -42,10 +42,10 @@ source_set("unit_tests") {
   deps = [
     ":common",
     "//base",
-    "//components/autofill/core/browser",
-    "//components/password_manager/core/browser",
+##    "//components/autofill/core/browser",
+#    "//components/password_manager/core/browser",
     "//components/search_engines",
-    "//components/signin/core/browser",
+#    "//components/signin/core/browser",
     "//sql",
     "//testing/gtest",
   ]
diff --git a/components/webdata_services/BUILD.gn b/components/webdata_services/BUILD.gn
index 8626a4c..f990bfa 100644
--- a/components/webdata_services/BUILD.gn
+++ b/components/webdata_services/BUILD.gn
@@ -12,11 +12,11 @@ static_library("webdata_services") {
 
   deps = [
     "//base",
-    "//components/autofill/core/browser",
+#    "//components/autofill/core/browser",
     "//components/keyed_service/core",
-    "//components/password_manager/core/browser",
+#    "//components/password_manager/core/browser",
     "//components/search_engines",
-    "//components/signin/core/browser",
+#    "//components/signin/core/browser",
     "//components/webdata/common",
     "//sql",
     "//sync",
@@ -33,7 +33,7 @@ source_set("test_support") {
   deps = [
     ":webdata_services",
     "//base",
-    "//components/autofill/core/browser",
-    "//components/signin/core/browser",
+#    "//components/autofill/core/browser",
+#    "//components/signin/core/browser",
   ]
 }
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
index 91fbfee..4abf52f 100644
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -23,18 +23,18 @@ source_set("browser") {
     "//base:base_static",
     "//content:resources",
     "//content/browser/service_worker:service_worker_proto",
-    "//content/browser/speech/proto",
+#    "//content/browser/speech/proto",
     "//content/public/common:common_sources",
     "//crypto",
-    "//device/battery",
-    "//device/vibration",
+#    "//device/battery",
+#    "//device/vibration",
     "//google_apis",
     "//net",
     "//skia",
     "//sql",
     "//third_party/npapi",
     "//third_party/re2",
-    "//third_party/WebKit/public:blink_headers",
+#    "//third_party/WebKit/public:blink_headers",
     "//third_party/zlib",
     "//third_party/zlib:zip",
     "//ui/accessibility",
@@ -102,7 +102,7 @@ source_set("browser") {
       "//content/browser/devtools:resources",
       "//content/common:mojo_bindings",
       "//content/public/common:mojo_bindings",
-      "//device/bluetooth",
+#      "//device/bluetooth",
       "//net:http_server",
       "//storage/browser",
       "//storage/common",
diff --git a/content/common/BUILD.gn b/content/common/BUILD.gn
index ab9e9a6..e4fffbc 100644
--- a/content/common/BUILD.gn
+++ b/content/common/BUILD.gn
@@ -157,7 +157,7 @@ source_set("common") {
     "//ui/gfx/ipc",
     "//ui/shell_dialogs",
     "//url",
-    "//third_party/libjingle",
+#    "//third_party/libjingle",
   ]
 
   if (!is_ios) {
diff --git a/content/public/renderer/BUILD.gn b/content/public/renderer/BUILD.gn
index 5de959b..eecb869 100644
--- a/content/public/renderer/BUILD.gn
+++ b/content/public/renderer/BUILD.gn
@@ -31,7 +31,7 @@ source_set("renderer_sources") {
     "//content/public/common:common_sources",
     "//content/renderer",
     "//skia",
-    "//third_party/libjingle",
+#    "//third_party/libjingle",
     "//third_party/WebKit/public:blink_headers",
     "//third_party/widevine/cdm:version_h",
     "//ui/gfx",
diff --git a/content/renderer/BUILD.gn b/content/renderer/BUILD.gn
index 73445e1..a2f2c0d 100644
--- a/content/renderer/BUILD.gn
+++ b/content/renderer/BUILD.gn
@@ -33,12 +33,12 @@ source_set("renderer") {
     "//content/public/child:child_sources",
     "//content/public/common:common_sources",
     "//content/public/common:mojo_bindings",
-    "//device/battery:mojo_bindings",
-    "//device/vibration:mojo_bindings",
+#    "//device/battery:mojo_bindings",
+#    "//device/vibration:mojo_bindings",
     "//gin",
     "//gpu",
     "//gpu/command_buffer/client:gles2_interface",
-    "//jingle:jingle_glue",
+#    "//jingle:jingle_glue",
     "//media",
     "//media/blink",
     "//mojo/environment:chromium",
@@ -46,7 +46,7 @@ source_set("renderer") {
     "//skia",
     "//storage/common",
     "//third_party/icu",
-    "//third_party/libjingle",
+#    "//third_party/libjingle",
     "//third_party/mojo/src/mojo/edk/js",
     "//third_party/mojo/src/mojo/public/js",
     "//third_party/mojo/src/mojo/public/interfaces/application",
@@ -130,8 +130,8 @@ source_set("renderer") {
       "//third_party/libyuv",
       "//third_party/webrtc/modules/audio_device",
       "//third_party/webrtc/modules/audio_processing",
-      "//third_party/libjingle:libjingle_webrtc",
-      "//third_party/libjingle:libpeerconnection",
+#      "//third_party/libjingle:libjingle_webrtc",
+#      "//third_party/libjingle:libpeerconnection",
     ]
   } else {
     sources += [
diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
index 18048ef..0418185 100644
--- a/content/test/BUILD.gn
+++ b/content/test/BUILD.gn
@@ -272,8 +272,8 @@ if (!is_mac) {
       "//content/shell:content_shell_lib",
       "//content/shell:pak",
       "//content/test:test_support",
-      "//device/battery",
-      "//device/battery:mojo_bindings",
+#      "//device/battery",
+#      "//device/battery:mojo_bindings",
       "//gin",
       "//gpu",
       "//ipc:test_support",
@@ -454,8 +454,8 @@ if (!is_mac) {  # TODO(GYP) enable on Mac once it links.
       "//content/public/common",
       "//content/public/common:mojo_bindings",
       "//crypto",
-      "//device/battery",
-      "//device/battery:mojo_bindings",
+#      "//device/battery",
+#      "//device/battery:mojo_bindings",
       "//mojo/environment:chromium",
       "//net:test_support",
       "//skia",
@@ -499,7 +499,7 @@ if (!is_mac) {  # TODO(GYP) enable on Mac once it links.
         "//third_party/WebKit/public:blink",
         "//third_party/icu",
         "//third_party/leveldatabase",
-        "//third_party/libjingle",
+#        "//third_party/libjingle",
         "//ui/gl",
       ]
     }
diff --git a/crypto/nss_util.cc b/crypto/nss_util.cc
index 5ee7c32..3a8f59f 100644
--- a/crypto/nss_util.cc
+++ b/crypto/nss_util.cc
@@ -33,7 +33,7 @@
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
-#include "base/metrics/histogram.h"
+//#include "base/metrics/histogram.h"
 #include "base/native_library.h"
 #include "base/path_service.h"
 #include "base/stl_util.h"
@@ -648,7 +648,7 @@ class NSSInitSingleton {
         initializing_tpm_token_(false),
         chaps_module_(NULL),
         root_(NULL) {
-    base::TimeTicks start_time = base::TimeTicks::Now();
+//    base::TimeTicks start_time = base::TimeTicks::Now();
 
     // It's safe to construct on any thread, since LazyInstance will prevent any
     // other threads from accessing until the constructor is done.
@@ -749,11 +749,11 @@ class NSSInitSingleton {
 
     // The UMA bit is conditionally set for this histogram in
     // components/startup_metric_utils.cc .
-    LOCAL_HISTOGRAM_CUSTOM_TIMES("Startup.SlowStartupNSSInit",
+/*    LOCAL_HISTOGRAM_CUSTOM_TIMES("Startup.SlowStartupNSSInit",
                                  base::TimeTicks::Now() - start_time,
                                  base::TimeDelta::FromMilliseconds(10),
                                  base::TimeDelta::FromHours(1),
-                                 50);
+                                 50);*/
   }
 
   // NOTE(willchan): We don't actually execute this code since we leak NSS to
diff --git a/device/hid/BUILD.gn b/device/hid/BUILD.gn
deleted file mode 100644
index 4a6a1b2..0000000
diff --git a/device/serial/BUILD.gn b/device/serial/BUILD.gn
deleted file mode 100644
index 099b7ad..0000000
diff --git a/device/usb/BUILD.gn b/device/usb/BUILD.gn
deleted file mode 100644
index 5a5d449..0000000
diff --git a/extensions/BUILD.gn b/extensions/BUILD.gn
index ae914e3..20201f3 100644
--- a/extensions/BUILD.gn
+++ b/extensions/BUILD.gn
@@ -59,7 +59,7 @@ grit("extensions_renderer_resources") {
   ]
 
   deps = [
-    "//device/serial:serial_mojo",
+#    "//device/serial:serial_mojo",
     "//extensions/common:mojo",
     "//extensions/common/api:mojom",
   ]
@@ -83,7 +83,7 @@ source_set("test_support") {
     "//extensions/browser",
     "//extensions/common",
     "//extensions/common/api",
-    "//extensions/common/api:api_registration",
+#    "//extensions/common/api:api_registration",
     "//net:test_support",
     "//testing/gmock",
     "//testing/gtest",
@@ -153,9 +153,9 @@ test("extensions_unittests") {
     "//components/keyed_service/content",
     "//components/user_prefs",
     "//content/test:test_support",
-    "//device/bluetooth:mocks",
-    "//device/serial",
-    "//device/serial:test_support",
+#    "//device/bluetooth:mocks",
+#    "//device/serial",
+#    "//device/serial:test_support",
     "//extensions/common",
     "//extensions/common/api/cast_channel:cast_channel_proto",
     "//extensions/renderer",
@@ -202,9 +202,9 @@ test("extensions_browsertests") {
     "//base",
     "//base:prefs_test_support",
     "//base/test:test_support",
-    "//components/storage_monitor:test_support",
+#    "//components/storage_monitor:test_support",
     "//content/test:test_support",
-    "//device/bluetooth:mocks",
+#    "//device/bluetooth:mocks",
     "//mojo/environment:chromium",
     "//testing/gmock",
     "//testing/gtest",
diff --git a/extensions/browser/BUILD.gn b/extensions/browser/BUILD.gn
index 4659457..1406e20 100644
--- a/extensions/browser/BUILD.gn
+++ b/extensions/browser/BUILD.gn
@@ -45,14 +45,14 @@ source_set("browser") {
 
     deps += [
       "//components/onc",
-      "//components/storage_monitor",
+#      "//components/storage_monitor",
       "//components/update_client",
       "//crypto:platform",
-      "//device/bluetooth",
-      "//device/core",
-      "//device/hid",
-      "//device/serial",
-      "//device/usb",
+#      "//device/bluetooth",
+#      "//device/core",
+#      "//device/hid",
+#      "//device/serial",
+#      "//device/usb",
       "//extensions/common/api/cast_channel:cast_channel_proto",
     ]
 
@@ -80,7 +80,32 @@ source_set("browser") {
                 extensions_gypi_values.extensions_browser_sources_linux_nonchromeos,
                 ".",
                 "//extensions")
+#        print(linux_sources)
         sources += linux_sources
+#        print(sources)
+#          if (is_linux && !use_udev) {                                                                                
+#    # Udev is the only Linux implementation. If we're compiling without Udev,
+#    # disable these unittests.
+#    sources -= [
+##      "hid/hid_connection_unittest.cc",
+##      "hid/hid_device_filter_unittest.cc",
+##      "hid/hid_report_descriptor_unittest.cc",
+##      "hid/input_service_linux_unittest.cc",
+##      "hid/test_report_descriptors.cc",
+##      "hid/test_report_descriptors.h",
+##      "serial/data_sink_unittest.cc",
+##      "serial/data_source_unittest.cc",
+##      "serial/serial_connection_unittest.cc",
+##      "serial/serial_service_unittest.cc",
+#    ]
+#
+#    deps -= [
+##      "//device/hid",
+##      "//device/serial",
+##      "//device/serial:test_support",
+#    ]
+#  }
+
       } else {
         nonlinux_sources = rebase_path(
                 extensions_gypi_values.extensions_browser_sources_nonlinux,
diff --git a/extensions/browser/browser_context_keyed_service_factories.cc b/extensions/browser/browser_context_keyed_service_factories.cc
index ebdf0e4..2c42b12 100644
--- a/extensions/browser/browser_context_keyed_service_factories.cc
+++ b/extensions/browser/browser_context_keyed_service_factories.cc
@@ -7,13 +7,13 @@
 #include "extensions/browser/api/alarms/alarm_manager.h"
 #include "extensions/browser/api/api_resource_manager.h"
 #include "extensions/browser/api/audio/audio_api.h"
-#include "extensions/browser/api/hid/hid_device_manager.h"
+//#include "extensions/browser/api/hid/hid_device_manager.h"
 #include "extensions/browser/api/idle/idle_manager_factory.h"
 #include "extensions/browser/api/management/management_api.h"
 #include "extensions/browser/api/networking_config/networking_config_service_factory.h"
 #include "extensions/browser/api/networking_private/networking_private_event_router_factory.h"
 #include "extensions/browser/api/runtime/runtime_api.h"
-#include "extensions/browser/api/serial/serial_connection.h"
+//#include "extensions/browser/api/serial/serial_connection.h"
 #include "extensions/browser/api/socket/socket.h"
 #include "extensions/browser/api/socket/tcp_socket.h"
 #include "extensions/browser/api/socket/udp_socket.h"
@@ -22,7 +22,7 @@
 #include "extensions/browser/api/sockets_udp/udp_socket_event_dispatcher.h"
 #include "extensions/browser/api/storage/storage_frontend.h"
 #include "extensions/browser/api/system_info/system_info_api.h"
-#include "extensions/browser/api/usb/usb_event_router.h"
+//#include "extensions/browser/api/usb/usb_event_router.h"
 #include "extensions/browser/api/vpn_provider/vpn_service_factory.h"
 #include "extensions/browser/extension_message_filter.h"
 #include "extensions/browser/extension_prefs_factory.h"
@@ -36,7 +36,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() {
   ApiResourceManager<ResumableTCPServerSocket>::GetFactoryInstance();
   ApiResourceManager<ResumableTCPSocket>::GetFactoryInstance();
   ApiResourceManager<ResumableUDPSocket>::GetFactoryInstance();
-  ApiResourceManager<SerialConnection>::GetFactoryInstance();
+//  ApiResourceManager<SerialConnection>::GetFactoryInstance();
   ApiResourceManager<Socket>::GetFactoryInstance();
   AudioAPI::GetFactoryInstance();
 #if defined(OS_CHROMEOS)
@@ -47,7 +47,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() {
   core_api::UDPSocketEventDispatcher::GetFactoryInstance();
   ExtensionMessageFilter::EnsureShutdownNotifierFactoryBuilt();
   ExtensionPrefsFactory::GetInstance();
-  HidDeviceManager::GetFactoryInstance();
+//  HidDeviceManager::GetFactoryInstance();
   IdleManagerFactory::GetInstance();
   ManagementAPI::GetFactoryInstance();
 #if defined(OS_CHROMEOS)
@@ -61,7 +61,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() {
   RuntimeAPI::GetFactoryInstance();
   StorageFrontend::GetFactoryInstance();
   SystemInfoAPI::GetFactoryInstance();
-  UsbEventRouter::GetFactoryInstance();
+//  UsbEventRouter::GetFactoryInstance();
 }
 
 }  // namespace extensions
diff --git a/extensions/browser/extension_web_contents_observer.cc b/extensions/browser/extension_web_contents_observer.cc
index 020cc32..98d01dd 100644
--- a/extensions/browser/extension_web_contents_observer.cc
+++ b/extensions/browser/extension_web_contents_observer.cc
@@ -12,7 +12,7 @@
 #include "content/public/common/url_constants.h"
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/browser/extension_registry.h"
-#include "extensions/browser/mojo/service_registration.h"
+//#include "extensions/browser/mojo/service_registration.h"
 #include "extensions/browser/view_type_utils.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension_messages.h"
@@ -92,7 +92,8 @@ void ExtensionWebContentsObserver::RenderViewCreated(
 
 void ExtensionWebContentsObserver::RenderFrameCreated(
     content::RenderFrameHost* render_frame_host) {
-  RegisterCoreExtensionServices(render_frame_host);
+    //TODO: do we need this ? this whole file i mean!
+//  RegisterCoreExtensionServices(render_frame_host);
 }
 
 void ExtensionWebContentsObserver::NotifyRenderViewType(
diff --git a/extensions/common/BUILD.gn b/extensions/common/BUILD.gn
index 1718727..d86eb73 100644
--- a/extensions/common/BUILD.gn
+++ b/extensions/common/BUILD.gn
@@ -46,8 +46,8 @@ if (enable_extensions) {
       "//components/url_matcher",
       "//content/public/common",
       "//crypto",
-      "//device/bluetooth",
-      "//device/usb",
+#      "//device/bluetooth",
+#      "//device/usb",
       "//extensions/common/api",
       "//extensions/strings",
       "//extensions:extensions_resources",
diff --git a/extensions/common/api/BUILD.gn b/extensions/common/api/BUILD.gn
index 38c379c..e8875d9 100644
--- a/extensions/common/api/BUILD.gn
+++ b/extensions/common/api/BUILD.gn
@@ -34,10 +34,11 @@ source_set("api") {
 json_schema_api("api_registration") {
   impl_dir = "//extensions/browser/api"
   bundle_registration = true
+#  bundle_registration = false
 
   deps = [
     ":api",
-    "//device/serial",
+##    "//device/serial",
     "//extensions/common/api/cast_channel:cast_channel_proto",
     "//skia",
   ]
diff --git a/extensions/common/api/schemas.gypi b/extensions/common/api/schemas.gypi
index ee46bd2..e499061 100644
--- a/extensions/common/api/schemas.gypi
+++ b/extensions/common/api/schemas.gypi
@@ -15,10 +15,10 @@
       'app_view_guest_internal.json',
       'app_window.idl',
       'audio.idl',
-      'bluetooth.idl',
-      'bluetooth_low_energy.idl',
-      'bluetooth_private.json',
-      'bluetooth_socket.idl',
+#      'bluetooth.idl',
+#      'bluetooth_low_energy.idl',
+#      'bluetooth_private.json',
+#      'bluetooth_socket.idl',
       'cast_channel.idl',
       'document_scan.idl',
       'dns.idl',
@@ -29,17 +29,17 @@
       'extension_types.json',
       'guest_view_internal.json',
       'management.json',
-      'hid.idl',
+#      'hid.idl',
       'idle.json',
       'mime_handler_private.idl',
       'mime_handler_view_guest_internal.json',
-      'mojo_private.idl',
+#      'mojo_private.idl',
       'networking_private.json',
       'power.idl',
-      'printer_provider.idl',
-      'printer_provider_internal.idl',
+#      'printer_provider.idl',
+#      'printer_provider_internal.idl',
       'runtime.json',
-      'serial.idl',
+#      'serial.idl',
       'socket.idl',
       'sockets_tcp.idl',
       'sockets_tcp_server.idl',
@@ -52,7 +52,7 @@
       'system_network.idl',
       'system_storage.idl',
       'test.json',
-      'usb.idl',
+#      'usb.idl',
       'virtual_keyboard_private.json',
       'web_request.json',
       'web_view_internal.json'
diff --git a/extensions/common/common_manifest_handlers.cc b/extensions/common/common_manifest_handlers.cc
index db137ff..a573f99 100644
--- a/extensions/common/common_manifest_handlers.cc
+++ b/extensions/common/common_manifest_handlers.cc
@@ -4,7 +4,7 @@
 
 #include "extensions/common/common_manifest_handlers.h"
 
-#include "extensions/common/api/bluetooth/bluetooth_manifest_handler.h"
+//#include "extensions/common/api/bluetooth/bluetooth_manifest_handler.h"
 #include "extensions/common/api/sockets/sockets_manifest_handler.h"
 #include "extensions/common/manifest_handler.h"
 #include "extensions/common/manifest_handlers/background_info.h"
@@ -31,7 +31,7 @@ namespace extensions {
 void RegisterCommonManifestHandlers() {
   DCHECK(!ManifestHandler::IsRegistrationFinalized());
   (new BackgroundManifestHandler)->Register();
-  (new BluetoothManifestHandler)->Register();
+//  (new BluetoothManifestHandler)->Register();
   (new ContentCapabilitiesHandler)->Register();
   (new CSPHandler(false))->Register();
   (new CSPHandler(true))->Register();
@@ -51,6 +51,7 @@ void RegisterCommonManifestHandlers() {
   (new SandboxedPageHandler)->Register();
   (new SharedModuleHandler)->Register();
   (new SocketsManifestHandler)->Register();
+  //TODO: what is this:
   (new WebAccessibleResourcesHandler)->Register();
   (new WebviewHandler)->Register();
 }
diff --git a/extensions/common/permissions/extensions_api_permissions.cc b/extensions/common/permissions/extensions_api_permissions.cc
index 3b21c61..e36b088 100644
--- a/extensions/common/permissions/extensions_api_permissions.cc
+++ b/extensions/common/permissions/extensions_api_permissions.cc
@@ -9,7 +9,7 @@
 #include "extensions/common/permissions/api_permission.h"
 #include "extensions/common/permissions/permission_message.h"
 #include "extensions/common/permissions/socket_permission.h"
-#include "extensions/common/permissions/usb_device_permission.h"
+//#include "extensions/common/permissions/usb_device_permission.h"
 #include "grit/extensions_strings.h"
 
 namespace extensions {
@@ -129,13 +129,13 @@ std::vector<APIPermissionInfo*> ExtensionsAPIPermissions::GetAllPermissions()
        "unlimitedStorage",
        APIPermissionInfo::kFlagCannotBeOptional |
            APIPermissionInfo::kFlagSupportsContentCapabilities},
-      {APIPermission::kUsb, "usb", APIPermissionInfo::kFlagNone},
+/*      {APIPermission::kUsb, "usb", APIPermissionInfo::kFlagNone},
       {APIPermission::kUsbDevice,
        "usbDevices",
        APIPermissionInfo::kFlagNone,
        0,
        PermissionMessage::kNone,
-       &CreateAPIPermission<UsbDevicePermission>},
+       &CreateAPIPermission<UsbDevicePermission>},*/
       {APIPermission::kVideoCapture,
        "videoCapture",
        APIPermissionInfo::kFlagNone,
diff --git a/extensions/extensions.gypi b/extensions/extensions.gypi
index 4c2e6cd..2f305a1 100644
--- a/extensions/extensions.gypi
+++ b/extensions/extensions.gypi
@@ -13,12 +13,12 @@
       'common/mojo/stash.mojom',
     ],
     'extensions_common_sources': [
-      'common/api/bluetooth/bluetooth_manifest_data.cc',
-      'common/api/bluetooth/bluetooth_manifest_data.h',
-      'common/api/bluetooth/bluetooth_manifest_handler.cc',
-      'common/api/bluetooth/bluetooth_manifest_handler.h',
-      'common/api/bluetooth/bluetooth_manifest_permission.cc',
-      'common/api/bluetooth/bluetooth_manifest_permission.h',
+#      'common/api/bluetooth/bluetooth_manifest_data.cc',
+#      'common/api/bluetooth/bluetooth_manifest_data.h',
+#      'common/api/bluetooth/bluetooth_manifest_handler.cc',
+#      'common/api/bluetooth/bluetooth_manifest_handler.h',
+#      'common/api/bluetooth/bluetooth_manifest_permission.cc',
+#      'common/api/bluetooth/bluetooth_manifest_permission.h',
       'common/api/messaging/message.h',
       'common/api/sockets/sockets_manifest_data.cc',
       'common/api/sockets/sockets_manifest_data.h',
@@ -194,10 +194,10 @@
       'common/permissions/socket_permission_data.h',
       'common/permissions/socket_permission_entry.cc',
       'common/permissions/socket_permission_entry.h',
-      'common/permissions/usb_device_permission.cc',
-      'common/permissions/usb_device_permission.h',
-      'common/permissions/usb_device_permission_data.cc',
-      'common/permissions/usb_device_permission_data.h',
+#      'common/permissions/usb_device_permission.cc',
+#      'common/permissions/usb_device_permission.h',
+#      'common/permissions/usb_device_permission_data.cc',
+#      'common/permissions/usb_device_permission_data.h',
       'common/stack_frame.cc',
       'common/stack_frame.h',
       'common/switches.cc',
@@ -250,34 +250,34 @@
       'browser/api/audio/audio_api.cc',
       'browser/api/audio/audio_api.h',
       'browser/api/audio/audio_service.h',
-      'browser/api/bluetooth/bluetooth_api.cc',
-      'browser/api/bluetooth/bluetooth_api.h',
-      'browser/api/bluetooth/bluetooth_api_pairing_delegate.cc',
-      'browser/api/bluetooth/bluetooth_api_pairing_delegate.h',
-      'browser/api/bluetooth/bluetooth_api_utils.cc',
-      'browser/api/bluetooth/bluetooth_api_utils.h',
-      'browser/api/bluetooth/bluetooth_event_router.cc',
-      'browser/api/bluetooth/bluetooth_event_router.h',
-      'browser/api/bluetooth/bluetooth_extension_function.cc',
-      'browser/api/bluetooth/bluetooth_extension_function.h',
-      'browser/api/bluetooth/bluetooth_private_api.cc',
-      'browser/api/bluetooth/bluetooth_private_api.h',
-      'browser/api/bluetooth_low_energy/bluetooth_low_energy_api.cc',
-      'browser/api/bluetooth_low_energy/bluetooth_low_energy_api.h',
-      'browser/api/bluetooth_low_energy/bluetooth_low_energy_connection.cc',
-      'browser/api/bluetooth_low_energy/bluetooth_low_energy_connection.h',
-      'browser/api/bluetooth_low_energy/bluetooth_low_energy_event_router.cc',
-      'browser/api/bluetooth_low_energy/bluetooth_low_energy_event_router.h',
-      'browser/api/bluetooth_low_energy/bluetooth_low_energy_notify_session.cc',
-      'browser/api/bluetooth_low_energy/bluetooth_low_energy_notify_session.h',
-      'browser/api/bluetooth_low_energy/utils.cc',
-      'browser/api/bluetooth_low_energy/utils.h',
-      'browser/api/bluetooth_socket/bluetooth_api_socket.cc',
-      'browser/api/bluetooth_socket/bluetooth_api_socket.h',
-      'browser/api/bluetooth_socket/bluetooth_socket_api.cc',
-      'browser/api/bluetooth_socket/bluetooth_socket_api.h',
-      'browser/api/bluetooth_socket/bluetooth_socket_event_dispatcher.cc',
-      'browser/api/bluetooth_socket/bluetooth_socket_event_dispatcher.h',
+#      'browser/api/bluetooth/bluetooth_api.cc',
+#      'browser/api/bluetooth/bluetooth_api.h',
+#      'browser/api/bluetooth/bluetooth_api_pairing_delegate.cc',
+#      'browser/api/bluetooth/bluetooth_api_pairing_delegate.h',
+#      'browser/api/bluetooth/bluetooth_api_utils.cc',
+#      'browser/api/bluetooth/bluetooth_api_utils.h',
+#      'browser/api/bluetooth/bluetooth_event_router.cc',
+#      'browser/api/bluetooth/bluetooth_event_router.h',
+#      'browser/api/bluetooth/bluetooth_extension_function.cc',
+#      'browser/api/bluetooth/bluetooth_extension_function.h',
+#      'browser/api/bluetooth/bluetooth_private_api.cc',
+#      'browser/api/bluetooth/bluetooth_private_api.h',
+#      'browser/api/bluetooth_low_energy/bluetooth_low_energy_api.cc',
+#      'browser/api/bluetooth_low_energy/bluetooth_low_energy_api.h',
+#      'browser/api/bluetooth_low_energy/bluetooth_low_energy_connection.cc',
+#      'browser/api/bluetooth_low_energy/bluetooth_low_energy_connection.h',
+#      'browser/api/bluetooth_low_energy/bluetooth_low_energy_event_router.cc',
+#      'browser/api/bluetooth_low_energy/bluetooth_low_energy_event_router.h',
+#      'browser/api/bluetooth_low_energy/bluetooth_low_energy_notify_session.cc',
+#      'browser/api/bluetooth_low_energy/bluetooth_low_energy_notify_session.h',
+#      'browser/api/bluetooth_low_energy/utils.cc',
+#      'browser/api/bluetooth_low_energy/utils.h',
+#      'browser/api/bluetooth_socket/bluetooth_api_socket.cc',
+#      'browser/api/bluetooth_socket/bluetooth_api_socket.h',
+#      'browser/api/bluetooth_socket/bluetooth_socket_api.cc',
+#      'browser/api/bluetooth_socket/bluetooth_socket_api.h',
+#      'browser/api/bluetooth_socket/bluetooth_socket_event_dispatcher.cc',
+#      'browser/api/bluetooth_socket/bluetooth_socket_event_dispatcher.h',
       'browser/api/capture_web_contents_function.cc',
       'browser/api/capture_web_contents_function.h',
       'browser/api/cast_channel/cast_auth_ica.cc',
@@ -346,12 +346,12 @@
       'browser/api/extensions_api_client.h',
       'browser/api/guest_view/guest_view_internal_api.cc',
       'browser/api/guest_view/guest_view_internal_api.h',
-      'browser/api/hid/hid_api.cc',
-      'browser/api/hid/hid_api.h',
-      'browser/api/hid/hid_connection_resource.cc',
-      'browser/api/hid/hid_connection_resource.h',
-      'browser/api/hid/hid_device_manager.cc',
-      'browser/api/hid/hid_device_manager.h',
+#      'browser/api/hid/hid_api.cc',
+#      'browser/api/hid/hid_api.h',
+#      'browser/api/hid/hid_connection_resource.cc',
+#      'browser/api/hid/hid_connection_resource.h',
+#      'browser/api/hid/hid_device_manager.cc',
+#      'browser/api/hid/hid_device_manager.h',
       'browser/api/idle/idle_api.cc',
       'browser/api/idle/idle_api.h',
       'browser/api/idle/idle_api_constants.cc',
@@ -383,27 +383,27 @@
       'browser/api/networking_private/networking_private_event_router_factory.h',
       'browser/api/power/power_api.cc',
       'browser/api/power/power_api.h',
-      'browser/api/printer_provider/printer_provider_api.cc',
-      'browser/api/printer_provider/printer_provider_api.h',
-      'browser/api/printer_provider/printer_provider_api_factory.cc',
-      'browser/api/printer_provider/printer_provider_api_factory.h',
-      'browser/api/printer_provider/printer_provider_print_job.cc',
-      'browser/api/printer_provider/printer_provider_print_job.h',
-      'browser/api/printer_provider_internal/printer_provider_internal_api.cc',
-      'browser/api/printer_provider_internal/printer_provider_internal_api.h',
-      'browser/api/printer_provider_internal/printer_provider_internal_api_observer.h',
+#      'browser/api/printer_provider/printer_provider_api.cc',
+#      'browser/api/printer_provider/printer_provider_api.h',
+#      'browser/api/printer_provider/printer_provider_api_factory.cc',
+#      'browser/api/printer_provider/printer_provider_api_factory.h',
+#      'browser/api/printer_provider/printer_provider_print_job.cc',
+#      'browser/api/printer_provider/printer_provider_print_job.h',
+#      'browser/api/printer_provider_internal/printer_provider_internal_api.cc',
+#      'browser/api/printer_provider_internal/printer_provider_internal_api.h',
+#      'browser/api/printer_provider_internal/printer_provider_internal_api_observer.h',
       'browser/api/runtime/runtime_api.cc',
       'browser/api/runtime/runtime_api.h',
       'browser/api/runtime/runtime_api_delegate.cc',
       'browser/api/runtime/runtime_api_delegate.h',
-      'browser/api/serial/serial_api.cc',
-      'browser/api/serial/serial_api.h',
-      'browser/api/serial/serial_connection.cc',
-      'browser/api/serial/serial_connection.h',
-      'browser/api/serial/serial_event_dispatcher.cc',
-      'browser/api/serial/serial_event_dispatcher.h',
-      'browser/api/serial/serial_service_factory.cc',
-      'browser/api/serial/serial_service_factory.h',
+#      'browser/api/serial/serial_api.cc',
+#      'browser/api/serial/serial_api.h',
+#      'browser/api/serial/serial_connection.cc',
+#      'browser/api/serial/serial_connection.h',
+#      'browser/api/serial/serial_event_dispatcher.cc',
+#      'browser/api/serial/serial_event_dispatcher.h',
+#      'browser/api/serial/serial_service_factory.cc',
+#      'browser/api/serial/serial_service_factory.h',
       'browser/api/socket/socket.cc',
       'browser/api/socket/socket.h',
       'browser/api/socket/socket_api.cc',
@@ -471,12 +471,12 @@
       'browser/api/system_storage/system_storage_api.h',
       'browser/api/test/test_api.cc',
       'browser/api/test/test_api.h',
-      'browser/api/usb/usb_api.cc',
-      'browser/api/usb/usb_api.h',
-      'browser/api/usb/usb_device_resource.cc',
-      'browser/api/usb/usb_device_resource.h',
-      'browser/api/usb/usb_event_router.cc',
-      'browser/api/usb/usb_event_router.h',
+#      'browser/api/usb/usb_api.cc',
+#      'browser/api/usb/usb_api.h',
+#      'browser/api/usb/usb_device_resource.cc',
+#      'browser/api/usb/usb_device_resource.h',
+#      'browser/api/usb/usb_event_router.cc',
+#      'browser/api/usb/usb_event_router.h',
       'browser/api/virtual_keyboard_private/virtual_keyboard_delegate.h',
       'browser/api/virtual_keyboard_private/virtual_keyboard_private_api.cc',
       'browser/api/virtual_keyboard_private/virtual_keyboard_private_api.h',
@@ -686,12 +686,12 @@
       'browser/load_monitoring_extension_host_queue.h',
       'browser/management_policy.cc',
       'browser/management_policy.h',
-      'browser/mojo/keep_alive_impl.cc',
-      'browser/mojo/keep_alive_impl.h',
-      'browser/mojo/service_registration.cc',
-      'browser/mojo/service_registration.h',
-      'browser/mojo/stash_backend.cc',
-      'browser/mojo/stash_backend.h',
+#      'browser/mojo/keep_alive_impl.cc',
+#      'browser/mojo/keep_alive_impl.h',
+#      'browser/mojo/service_registration.cc',
+#      'browser/mojo/service_registration.h',
+#      'browser/mojo/stash_backend.cc',
+#      'browser/mojo/stash_backend.h',
       'browser/notification_types.cc',
       'browser/notification_types.h',
       'browser/null_app_sorting.cc',
diff --git a/extensions/renderer/dispatcher.cc b/extensions/renderer/dispatcher.cc
index e4287e5..fc58ca2 100644
--- a/extensions/renderer/dispatcher.cc
+++ b/extensions/renderer/dispatcher.cc
@@ -620,6 +620,7 @@ std::vector<std::pair<std::string, int> > Dispatcher::GetJsResources() {
   resources.push_back(std::make_pair("webViewInternal",
                                      IDR_WEB_VIEW_INTERNAL_CUSTOM_BINDINGS_JS));
   resources.push_back(std::make_pair("denyWebView", IDR_WEB_VIEW_DENY_JS));
+#if defined(ENABLE_MEDIA_MOJO_RENDERER)
   resources.push_back(
       std::make_pair(mojo::kBindingsModuleName, IDR_MOJO_BINDINGS_JS));
   resources.push_back(
@@ -650,7 +651,7 @@ std::vector<std::pair<std::string, int> > Dispatcher::GetJsResources() {
   resources.push_back(std::make_pair("stash_client", IDR_STASH_CLIENT_JS));
   resources.push_back(
       std::make_pair("extensions/common/mojo/stash.mojom", IDR_STASH_MOJOM_JS));
-
+#endif
   // Custom bindings.
   resources.push_back(
       std::make_pair("app.runtime", IDR_APP_RUNTIME_CUSTOM_BINDINGS_JS));
@@ -666,10 +667,12 @@ std::vector<std::pair<std::string, int> > Dispatcher::GetJsResources() {
   resources.push_back(std::make_pair("i18n", IDR_I18N_CUSTOM_BINDINGS_JS));
   resources.push_back(std::make_pair(
       "mimeHandlerPrivate", IDR_MIME_HANDLER_PRIVATE_CUSTOM_BINDINGS_JS));
+#if defined(ENABLE_MEDIA_MOJO_RENDERER)
   resources.push_back(std::make_pair("extensions/common/api/mime_handler.mojom",
                                      IDR_MIME_HANDLER_MOJOM_JS));
   resources.push_back(
       std::make_pair("mojoPrivate", IDR_MOJO_PRIVATE_CUSTOM_BINDINGS_JS));
+#endif
   resources.push_back(
       std::make_pair("permissions", IDR_PERMISSIONS_CUSTOM_BINDINGS_JS));
   resources.push_back(std::make_pair("printerProvider",
@@ -682,6 +685,7 @@ std::vector<std::pair<std::string, int> > Dispatcher::GetJsResources() {
                      IDR_WEB_VIEW_REQUEST_CUSTOM_BINDINGS_JS));
   resources.push_back(std::make_pair("binding", IDR_BINDING_JS));
 
+#if defined(ENABLE_MEDIA_MOJO_RENDERER)
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableMojoSerialService)) {
     resources.push_back(
@@ -692,6 +696,7 @@ std::vector<std::pair<std::string, int> > Dispatcher::GetJsResources() {
       std::make_pair("device/serial/serial.mojom", IDR_SERIAL_MOJOM_JS));
   resources.push_back(std::make_pair("device/serial/serial_serialization.mojom",
                                      IDR_SERIAL_SERIALIZATION_MOJOM_JS));
+#endif
 
   // Custom types sources.
   resources.push_back(std::make_pair("StorageArea", IDR_STORAGE_AREA_JS));
diff --git a/extensions/renderer/resources/extensions_renderer_resources.grd b/extensions/renderer/resources/extensions_renderer_resources.grd
index 439079e..82e7204 100644
--- a/extensions/renderer/resources/extensions_renderer_resources.grd
+++ b/extensions/renderer/resources/extensions_renderer_resources.grd
@@ -11,31 +11,44 @@
       <!-- Extension libraries. -->
       <include name="IDR_APP_VIEW_DENY_JS" file="guest_view/app_view_deny.js" type="BINDATA" />
       <include name="IDR_APP_VIEW_JS" file="guest_view/app_view.js" type="BINDATA" />
+
+      <!--
+      <if expr="enable_media_mojo_renderer"> <- well that 'if' has no effect 
       <include name="IDR_ASYNC_WAITER_JS" file="async_waiter.js" type="BINDATA" />
       <include name="IDR_DATA_RECEIVER_JS" file="data_receiver.js" type="BINDATA" />
       <include name="IDR_DATA_SENDER_JS" file="data_sender.js" type="BINDATA" />
       <include name="IDR_DATA_STREAM_MOJOM_JS" file="${mojom_root}\device\serial\data_stream.mojom.js" use_base_dir="false" type="BINDATA" />
       <include name="IDR_DATA_STREAM_SERIALIZATION_MOJOM_JS" file="${mojom_root}\device\serial\data_stream_serialization.mojom.js" use_base_dir="false" type="BINDATA" />
+      </if>
+      -->
       <include name="IDR_ENTRY_ID_MANAGER" file="entry_id_manager.js" type="BINDATA" />
       <include name="IDR_EVENT_BINDINGS_JS" file="event.js" type="BINDATA" />
       <include name="IDR_IMAGE_UTIL_JS" file="image_util.js" type="BINDATA" />
       <include name="IDR_JSON_SCHEMA_JS" file="json_schema.js" type="BINDATA" />
       <include name="IDR_KEEP_ALIVE_JS" file="keep_alive.js" type="BINDATA" />
+      <!--
       <include name="IDR_KEEP_ALIVE_MOJOM_JS" file="${mojom_root}\extensions\common\mojo\keep_alive.mojom.js" use_base_dir="false" type="BINDATA" />
+      -->
       <include name="IDR_LAST_ERROR_JS" file="last_error.js" type="BINDATA" />
       <include name="IDR_MESSAGING_JS" file="messaging.js" type="BINDATA" />
       <include name="IDR_MESSAGING_UTILS_JS" file="messaging_utils.js" type="BINDATA" />
       <include name="IDR_MIME_HANDLER_PRIVATE_CUSTOM_BINDINGS_JS" file="mime_handler_private_custom_bindings.js" type="BINDATA" />
+      <!--
       <include name="IDR_MIME_HANDLER_MOJOM_JS" file="${mojom_root}\extensions\common\api\mime_handler.mojom.js" use_base_dir="false" type="BINDATA" />
+      -->
       <include name="IDR_SCHEMA_UTILS_JS" file="schema_utils.js" type="BINDATA" />
       <include name="IDR_SEND_REQUEST_JS" file="send_request.js" type="BINDATA" />
+      <!--
       <include name="IDR_SERIAL_CUSTOM_BINDINGS_JS" file="serial_custom_bindings.js" type="BINDATA" />
       <include name="IDR_SERIAL_MOJOM_JS" file="${mojom_root}\device\serial\serial.mojom.js" use_base_dir="false" type="BINDATA" />
       <include name="IDR_SERIAL_SERIALIZATION_MOJOM_JS" file="${mojom_root}\device\serial\serial_serialization.mojom.js" use_base_dir="false" type="BINDATA" />
       <include name="IDR_SERIAL_SERVICE_JS" file="serial_service.js" type="BINDATA" />
+      -->
       <include name="IDR_SET_ICON_JS" file="set_icon.js" type="BINDATA" />
       <include name="IDR_STASH_CLIENT_JS" file="stash_client.js" type="BINDATA" />
+      <!--
       <include name="IDR_STASH_MOJOM_JS" file="${mojom_root}\extensions\common\mojo\stash.mojom.js" use_base_dir="false" type="BINDATA" />
+      -->
       <include name="IDR_BROWSER_TEST_ENVIRONMENT_SPECIFIC_BINDINGS_JS" file="browser_test_environment_specific_bindings.js" type="BINDATA" />
       <include name="IDR_TEST_CUSTOM_BINDINGS_JS" file="test_custom_bindings.js" type="BINDATA" />
       <include name="IDR_UNCAUGHT_EXCEPTION_HANDLER_JS" file="uncaught_exception_handler.js" type="BINDATA" />
diff --git a/extensions/shell/BUILD.gn b/extensions/shell/BUILD.gn
index 2e12978..a8f16d1 100644
--- a/extensions/shell/BUILD.gn
+++ b/extensions/shell/BUILD.gn
@@ -37,10 +37,10 @@ source_set("app_shell_lib") {
     "//components/web_cache/renderer",
     "//content",
     "//content/shell:content_shell_lib",
-    "//device/core",
-    "//device/hid",
+#    "//device/core",
+#    "//device/hid",
     "//extensions/common/api",
-    "//extensions/common/api:api_registration",
+#    "//extensions/common/api:api_registration",
     "//extensions/browser",
     "//extensions/common",
     "//extensions/renderer",
diff --git a/extensions/shell/app_shell.gyp b/extensions/shell/app_shell.gyp
index 1837fd8..a70a30d 100644
--- a/extensions/shell/app_shell.gyp
+++ b/extensions/shell/app_shell.gyp
@@ -32,7 +32,7 @@
         '<(DEPTH)/content/content.gyp:content_ppapi_plugin',
         '<(DEPTH)/content/content_shell_and_tests.gyp:content_shell_lib',
         '<(DEPTH)/device/core/core.gyp:device_core',
-        '<(DEPTH)/device/hid/hid.gyp:device_hid',
+#        '<(DEPTH)/device/hid/hid.gyp:device_hid',
         '<(DEPTH)/extensions/browser/api/api_registration.gyp:extensions_api_registration',
         '<(DEPTH)/extensions/common/api/api.gyp:extensions_api',
         '<(DEPTH)/extensions/extensions.gyp:extensions_browser',
diff --git a/media/audio/alsa/audio_manager_alsa.cc b/media/audio/alsa/audio_manager_alsa.cc
index e44c8c8..7ae20eb 100644
--- a/media/audio/alsa/audio_manager_alsa.cc
+++ b/media/audio/alsa/audio_manager_alsa.cc
@@ -8,7 +8,7 @@
 #include "base/environment.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
-#include "base/metrics/histogram.h"
+//#include "base/metrics/histogram.h"
 #include "base/nix/xdg_util.h"
 #include "base/process/launch.h"
 #include "base/stl_util.h"
diff --git a/media/audio/audio_output_resampler.cc b/media/audio/audio_output_resampler.cc
index f053444..8dde973e 100644
--- a/media/audio/audio_output_resampler.cc
+++ b/media/audio/audio_output_resampler.cc
@@ -7,7 +7,7 @@
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/compiler_specific.h"
-#include "base/metrics/histogram.h"
+//#include "base/metrics/histogram.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/single_thread_task_runner.h"
 #include "base/time/time.h"
@@ -68,6 +68,7 @@ class OnMoreDataConverter
   DISALLOW_COPY_AND_ASSIGN(OnMoreDataConverter);
 };
 
+/*
 // Record UMA statistics for hardware output configuration.
 static void RecordStats(const AudioParameters& output_params) {
   // Note the 'PRESUBMIT_IGNORE_UMA_MAX's below, these silence the PRESUBMIT.py
@@ -122,7 +123,7 @@ static void RecordFallbackStats(const AudioParameters& output_params) {
         "Media.FallbackHardwareAudioSamplesPerSecondUnexpected",
         output_params.sample_rate());
   }
-}
+}*/
 
 // Converts low latency based |output_params| into high latency appropriate
 // output parameters in error situations.
@@ -166,7 +167,7 @@ AudioOutputResampler::AudioOutputResampler(AudioManager* audio_manager,
   DCHECK_EQ(output_params_.format(), AudioParameters::AUDIO_PCM_LOW_LATENCY);
 
   // Record UMA statistics for the hardware configuration.
-  RecordStats(output_params);
+//  RecordStats(output_params);
 
   Initialize();
 }
@@ -206,10 +207,10 @@ bool AudioOutputResampler::OpenStream() {
   if (dispatcher_->OpenStream()) {
     // Only record the UMA statistic if we didn't fallback during construction
     // and only for the first stream we open.
-    if (!streams_opened_ &&
+/*    if (!streams_opened_ &&
         output_params_.format() == AudioParameters::AUDIO_PCM_LOW_LATENCY) {
       UMA_HISTOGRAM_BOOLEAN("Media.FallbackToHighLatencyAudioPath", false);
-    }
+    }*/
     streams_opened_ = true;
     return true;
   }
@@ -225,7 +226,7 @@ bool AudioOutputResampler::OpenStream() {
 
   // Record UMA statistics about the hardware which triggered the failure so
   // we can debug and triage later.
-  RecordFallbackStats(output_params_);
+//  RecordFallbackStats(output_params_);
 
   // Only Windows has a high latency output driver that is not the same as the
   // low latency path.
diff --git a/media/audio/linux/audio_manager_linux.cc b/media/audio/linux/audio_manager_linux.cc
index 0e7c981..91c071f 100644
--- a/media/audio/linux/audio_manager_linux.cc
+++ b/media/audio/linux/audio_manager_linux.cc
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/command_line.h"
-#include "base/metrics/histogram.h"
+//#include "base/metrics/histogram.h"
 #if defined(USE_ALSA)
 #include "media/audio/alsa/audio_manager_alsa.h"
 #else
@@ -29,7 +29,7 @@ enum LinuxAudioIO {
 AudioManager* CreateAudioManager(AudioLogFactory* audio_log_factory) {
 #if defined(USE_CRAS)
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kUseCras)) {
-    UMA_HISTOGRAM_ENUMERATION("Media.LinuxAudioIO", kCras, kAudioIOMax + 1);
+//    UMA_HISTOGRAM_ENUMERATION("Media.LinuxAudioIO", kCras, kAudioIOMax + 1);
     return new AudioManagerCras(audio_log_factory);
   }
 #endif
@@ -37,13 +37,13 @@ AudioManager* CreateAudioManager(AudioLogFactory* audio_log_factory) {
 #if defined(USE_PULSEAUDIO)
   AudioManager* manager = AudioManagerPulse::Create(audio_log_factory);
   if (manager) {
-    UMA_HISTOGRAM_ENUMERATION("Media.LinuxAudioIO", kPulse, kAudioIOMax + 1);
+//    UMA_HISTOGRAM_ENUMERATION("Media.LinuxAudioIO", kPulse, kAudioIOMax + 1);
     return manager;
   }
 #endif
 
 #if defined(USE_ALSA)
-  UMA_HISTOGRAM_ENUMERATION("Media.LinuxAudioIO", kAlsa, kAudioIOMax + 1);
+//  UMA_HISTOGRAM_ENUMERATION("Media.LinuxAudioIO", kAlsa, kAudioIOMax + 1);
   return new AudioManagerAlsa(audio_log_factory);
 #else
   return new FakeAudioManager(audio_log_factory);
diff --git a/media/media_options.gni b/media/media_options.gni
index 833b904..c8f9135 100644
--- a/media/media_options.gni
+++ b/media/media_options.gni
@@ -47,7 +47,7 @@ declare_args() {
 
   # Enables browser side Content Decryption Modules. Required for embedders
   # (e.g. Android and ChromeCast) that use a browser side CDM.
-  enable_browser_cdms = is_android
+  #enable_browser_cdms = is_android
 
   # Experiment to enable mojo based media renderer: http://crbug.com/431776
   enable_media_mojo_renderer = false
diff --git a/printing/BUILD.gn b/printing/BUILD.gn
index d035801..4eea44a 100644
--- a/printing/BUILD.gn
+++ b/printing/BUILD.gn
@@ -13,6 +13,9 @@ if (is_android) {
 }
 
 component("printing") {
+# sources = []
+# deps = []
+  if (enable_basic_printing) {
   sources = [
     "backend/print_backend.cc",
     "backend/print_backend.h",
@@ -185,6 +188,16 @@ component("printing") {
 
     deps += [ ":printing_jni_headers" ]
   }
+
+#  if (!skia_support_pdf) {
+#    sources -= [
+#    "pdf_metafile_skia.cc",
+#    "pdf_metafile_skia.h",
+#    "metafile_skia_wrapper.cc",
+#    "metafile_skia_wrapper.h",
+#    ]
+#  }
+  }
 }
 
 test("printing_unittests") {
diff --git a/remoting/client/BUILD.gn b/remoting/client/BUILD.gn
index 93ae064..9a06846 100644
--- a/remoting/client/BUILD.gn
+++ b/remoting/client/BUILD.gn
@@ -4,7 +4,7 @@
 
 import("//remoting/remoting_version.gni")
 
-static_library("client") {
+static_library("clientNO") {
   gypi_values = exec_script("//build/gypi_to_gn.py",
                             [ rebase_path("../remoting_srcs.gypi") ],
                             "scope",
@@ -20,6 +20,6 @@ static_library("client") {
     "//remoting/base",
     "//remoting/protocol",
     "//third_party/libyuv",
-    "//third_party/webrtc/modules/desktop_capture",
+#    "//third_party/webrtc/modules/desktop_capture",
   ]
 }
diff --git a/skia/BUILD.gn b/skia/BUILD.gn
index 3e3bc0c..ceec1ca 100644
--- a/skia/BUILD.gn
+++ b/skia/BUILD.gn
@@ -59,15 +59,17 @@ gypi_skia_gpu =
                 [ "//third_party/skia/gyp/gpu.gypi" ])
 
 # The list of Skia pdf sources that are to be set for chromium.
-gypi_skia_pdf =
-    exec_script("//build/gypi_to_gn.py",
-                [
-                  rebase_path("//third_party/skia/gyp/pdf.gypi"),
-                  "--replace=<(skia_include_path)=//third_party/skia/include",
-                  "--replace=<(skia_src_path)=//third_party/skia/src",
-                ],
-                "scope",
-                [ "//third_party/skia/gyp/pdf.gypi" ])
+
+#You set the variable "gypi_skia_pdf" here and it was unused before it went
+#gypi_skia_pdf =
+#    exec_script("//build/gypi_to_gn.py",
+#                [
+#                  rebase_path("//third_party/skia/gyp/pdf.gypi"),
+#                  "--replace=<(skia_include_path)=//third_party/skia/include",
+#                  "--replace=<(skia_src_path)=//third_party/skia/src",
+#                ],
+#                "scope",
+#                [ "//third_party/skia/gyp/pdf.gypi" ])
 
 # The list of Skia effects that are to be set for chromium.
 gypi_skia_effects =
diff --git a/skia/ext/image_operations.cc b/skia/ext/image_operations.cc
index a14344d..b6cde1d 100644
--- a/skia/ext/image_operations.cc
+++ b/skia/ext/image_operations.cc
@@ -12,7 +12,7 @@
 // TODO(pkasting): skia/ext should not depend on base/!
 #include "base/containers/stack_container.h"
 #include "base/logging.h"
-#include "base/metrics/histogram.h"
+//#include "base/metrics/histogram.h"
 #include "base/time/time.h"
 #include "base/trace_event/trace_event.h"
 #include "build/build_config.h"
@@ -394,8 +394,8 @@ SkBitmap ImageOperations::Resize(const SkBitmap& source,
                  static_cast<unsigned char*>(result.getPixels()),
                  true);
 
-  base::TimeDelta delta = base::TimeTicks::Now() - resize_start;
-  UMA_HISTOGRAM_TIMES("Image.ResampleMS", delta);
+//  base::TimeDelta delta = base::TimeTicks::Now() - resize_start;
+//  UMA_HISTOGRAM_TIMES("Image.ResampleMS", delta);
 
   return result;
 }
diff --git a/third_party/leveldatabase/env_chromium.cc b/third_party/leveldatabase/env_chromium.cc
index 42bdb42..a78b167 100644
--- a/third_party/leveldatabase/env_chromium.cc
+++ b/third_party/leveldatabase/env_chromium.cc
@@ -12,7 +12,7 @@
 #include "base/files/file_util.h"
 #include "base/lazy_instance.h"
 #include "base/memory/shared_memory.h"
-#include "base/metrics/histogram.h"
+//#include "base/metrics/histogram.h"
 #include "base/process/process_metrics.h"
 #include "base/stl_util.h"
 #include "base/strings/utf_string_conversions.h"
diff --git a/third_party/libaddressinput/BUILD.gn b/third_party/libaddressinput/BUILD.gn
index 1307c71..570ed63 100644
--- a/third_party/libaddressinput/BUILD.gn
+++ b/third_party/libaddressinput/BUILD.gn
@@ -97,8 +97,9 @@ grit("strings") {
 
 config("libaddressinput_config") {
   defines = [
+  #TODO: see if this can be removed: apparently the first one is needed but it's using deprecated stuff from /base/basictypes.h
     "I18N_ADDRESSINPUT_USE_BASICTYPES_OVERRIDE=1",
-    "I18N_ADDRESS_VALIDATION_DATA_URL=\"https://i18napis.appspot.com/ssl-aggregate-address/\"",
+#    "I18N_ADDRESS_VALIDATION_DATA_URL=\"https://i18napis.appspot.com/ssl-aggregate-address/\"",
   ]
   include_dirs = [
     "src/cpp/include",
diff --git a/third_party/libaddressinput/libaddressinput.gyp b/third_party/libaddressinput/libaddressinput.gyp
index 3fca856..a889919 100644
--- a/third_party/libaddressinput/libaddressinput.gyp
+++ b/third_party/libaddressinput/libaddressinput.gyp
@@ -114,7 +114,7 @@
       ],
       'direct_dependent_settings': {
         'defines': [
-          'I18N_ADDRESS_VALIDATION_DATA_URL="https://i18napis.appspot.com/ssl-aggregate-address/"',
+#          'I18N_ADDRESS_VALIDATION_DATA_URL="https://i18napis.appspot.com/ssl-aggregate-address/"',
         ],
       },
       'dependencies': [
diff --git a/third_party/libusb/BUILD.gn b/third_party/libusb/BUILD.gn
deleted file mode 100644
index bcab792..0000000
diff --git a/tools/json_schema_compiler/schema_loader.py b/tools/json_schema_compiler/schema_loader.py
index aad661e..95c4d99 100644
--- a/tools/json_schema_compiler/schema_loader.py
+++ b/tools/json_schema_compiler/schema_loader.py
@@ -84,6 +84,7 @@ class SchemaLoader(object):
     _, schema_extension = os.path.splitext(schema)
 
     schema_path = os.path.join(self._root, schema)
+    print(schema_path)
     if schema_extension == '.json':
       api_defs = json_schema.Load(schema_path)
     elif schema_extension == '.idl':
diff --git a/ui/events/event.cc b/ui/events/event.cc
index 5e7d8c8..2d1f29f 100644
--- a/ui/events/event.cc
+++ b/ui/events/event.cc
@@ -13,7 +13,7 @@
 #include <cmath>
 #include <cstring>
 
-#include "base/metrics/histogram.h"
+//#include "base/metrics/histogram.h"
 #include "base/strings/stringprintf.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/keycodes/dom3/dom_code.h"
@@ -221,23 +221,23 @@ Event::Event(const base::NativeEvent& native_event,
       phase_(EP_PREDISPATCH),
       result_(ER_UNHANDLED),
       source_device_id_(ED_UNKNOWN_DEVICE) {
-  base::TimeDelta delta = EventTimeForNow() - time_stamp_;
-  if (type_ < ET_LAST)
-    name_ = EventTypeName(type_);
-  base::HistogramBase::Sample delta_sample =
-      static_cast<base::HistogramBase::Sample>(delta.InMicroseconds());
-  UMA_HISTOGRAM_CUSTOM_COUNTS("Event.Latency.Browser", delta_sample, 1, 1000000,
-                              100);
-  std::string name_for_event =
-      base::StringPrintf("Event.Latency.Browser.%s", name_.c_str());
-  base::HistogramBase* counter_for_type =
-      base::Histogram::FactoryGet(
-          name_for_event,
-          1,
-          1000000,
-          100,
-          base::HistogramBase::kUmaTargetedHistogramFlag);
-  counter_for_type->Add(delta_sample);
+//  base::TimeDelta delta = EventTimeForNow() - time_stamp_;
+//  if (type_ < ET_LAST)
+//    name_ = EventTypeName(type_);
+//  base::HistogramBase::Sample delta_sample =
+//      static_cast<base::HistogramBase::Sample>(delta.InMicroseconds());
+//  UMA_HISTOGRAM_CUSTOM_COUNTS("Event.Latency.Browser", delta_sample, 1, 1000000,
+//                              100);
+//  std::string name_for_event =
+//      base::StringPrintf("Event.Latency.Browser.%s", name_.c_str());
+//  base::HistogramBase* counter_for_type =
+//      base::Histogram::FactoryGet(
+//          name_for_event,
+//          1,
+//          1000000,
+//          100,
+//          base::HistogramBase::kUmaTargetedHistogramFlag);
+//  counter_for_type->Add(delta_sample);
 
 #if defined(USE_X11)
   if (native_event->type == GenericEvent) {
